[11/50] [abbrv] git commit: Corrects version in poms
Corrects version in poms Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3575bebf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3575bebf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3575bebf Branch: refs/heads/feature/http-interceptor Commit: 3575bebf01caa7f8676383495c8276cd8d4e688e Parents: c22146b Author: Lukasz Lenart Authored: Mon Apr 28 08:52:37 2014 +0200 Committer: Lukasz Lenart Committed: Mon Apr 28 08:52:37 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 53 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 190b21e..675de3f 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.18-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index e321ab8..3335999 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.18-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 6e4e5d5..7275fdf 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.18-SNAPSHOT struts2-mailreader http://git-wip-us.apache.org/repos/asf/struts/blob/3575bebf/apps/pom.x
[04/50] [abbrv] git commit: Updates archetypes' version
Updates archetypes' version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/98621574 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/98621574 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/98621574 Branch: refs/heads/feature/http-interceptor Commit: 986215740a0c51c4a2a2eb3e2b22c66ebeb279ed Parents: 149181a Author: Lukasz Lenart Authored: Thu Apr 24 20:19:02 2014 +0200 Committer: Lukasz Lenart Committed: Thu Apr 24 20:19:02 2014 +0200 -- src/site/resources/archetype-catalog.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/98621574/src/site/resources/archetype-catalog.xml -- diff --git a/src/site/resources/archetype-catalog.xml b/src/site/resources/archetype-catalog.xml index d1989bb..fab8fde 100644 --- a/src/site/resources/archetype-catalog.xml +++ b/src/site/resources/archetype-catalog.xml @@ -7,42 +7,42 @@ org.apache.struts struts2-archetype-blank -2.3.16.1 +2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Blank org.apache.struts struts2-archetype-convention -2.3.16.1 +2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Blank Convention org.apache.struts struts2-archetype-dbportlet -2.3.16.1 +2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Database Portlet org.apache.struts struts2-archetype-plugin -2.3.16.1 +2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Plugin org.apache.struts struts2-archetype-portlet -2.3.16.1 +2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Portlet org.apache.struts struts2-archetype-starter -2.3.16.1 +2.3.16.2 http://repo1.maven.org/maven2/ Struts 2 Archetypes - Starter
[27/50] [abbrv] git commit: [maven-release-plugin] prepare release STRUTS_2_3_16_3
[maven-release-plugin] prepare release STRUTS_2_3_16_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e03ff728 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e03ff728 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e03ff728 Branch: refs/heads/feature/exclude-object-class Commit: e03ff728618f5bf551083fc3a52d43c07434bbc9 Parents: 0761909 Author: Lukasz Lenart Authored: Fri May 2 17:10:41 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:41 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 81a88d5..b7343c6 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index b77c977..62c6803 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index bb7ae7c..c41bb76 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-mailreader http://git-wip-u
[18/50] [abbrv] git commit: Overrides pattern exclusion initialisation to allow test to pass
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9fd44fb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9fd44fb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9fd44fb
Branch: refs/heads/feature/http-interceptor
Commit: c9fd44fbd552a8b3474fe846be2d2834453133ef
Parents: 1be8ed6
Author: Lukasz Lenart
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 14:52:20 2014 +0200
--
.../xwork2/interceptor/ParametersInterceptorTest.java| 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c9fd44fb/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
return result;
}
+@Override
+protected void initializeHardCodedExcludePatterns() {
+excludeParams = new HashSet();
+}
};
container.inject(pi);
[24/50] [abbrv] git commit: Updates docs assembly with new location of exported pages
Updates docs assembly with new location of exported pages Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0761909c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0761909c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0761909c Branch: refs/heads/feature/http-interceptor Commit: 0761909c65f32a0df9fc392704bf9d248bfea2c8 Parents: bca525d Author: Lukasz Lenart Authored: Fri May 2 15:47:34 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:47:34 2014 +0200 -- assembly/src/main/assembly/docs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0761909c/assembly/src/main/assembly/docs.xml -- diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 77dffcb..b1f9991 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -47,7 +47,7 @@ -target/cwiki/WW/docs +target/cwiki/ docs
[45/50] [abbrv] git commit: Extends logging with more information
Extends logging with more information
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/833a07e7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/833a07e7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/833a07e7
Branch: refs/heads/feature/exclude-object-class
Commit: 833a07e7fa1143f2a09786d561da70f144954c60
Parents: bfbc4c0
Author: Lukasz Lenart
Authored: Wed May 14 08:24:03 2014 +0200
Committer: Lukasz Lenart
Committed: Wed May 14 08:24:03 2014 +0200
--
.../src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/833a07e7/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 83be3ed..1e4a576 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -198,7 +198,7 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
throw new XWorkException(message, re);
} else {
if (LOG.isWarnEnabled()) {
-LOG.warn("Error setting value", re);
+LOG.warn("Error setting value [#0] with expression [#1]", re,
value.toString(), expr);
}
}
}
[23/50] [abbrv] git commit: Sets version in poms to -SNAPSHOT
Sets version in poms to -SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bca525da Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bca525da Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bca525da Branch: refs/heads/feature/http-interceptor Commit: bca525da8ddf73da634b7e906254a66294293909 Parents: 769e815 Author: Lukasz Lenart Authored: Fri May 2 15:36:19 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:36:19 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6054fc4..81a88d5 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0aebae0..b77c977 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f2fc344..bb7ae7c 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-mailreader http://git-wip-us.apache.org/repos/asf/stru
[25/50] [abbrv] git commit: Updates docs assembly with new location of exported pages
Updates docs assembly with new location of exported pages Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0761909c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0761909c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0761909c Branch: refs/heads/feature/exclude-object-class Commit: 0761909c65f32a0df9fc392704bf9d248bfea2c8 Parents: bca525d Author: Lukasz Lenart Authored: Fri May 2 15:47:34 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:47:34 2014 +0200 -- assembly/src/main/assembly/docs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0761909c/assembly/src/main/assembly/docs.xml -- diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 77dffcb..b1f9991 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -47,7 +47,7 @@ -target/cwiki/WW/docs +target/cwiki/ docs
[41/50] [abbrv] git commit: Cleans up imports
Cleans up imports Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9884c49f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9884c49f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9884c49f Branch: refs/heads/feature/exclude-object-class Commit: 9884c49fd0d4683d3376070bc75d88a4afcb6a25 Parents: 4577e5e Author: Lukasz Lenart Authored: Mon May 12 08:26:50 2014 +0200 Committer: Lukasz Lenart Committed: Mon May 12 08:26:50 2014 +0200 -- .../xwork2/interceptor/ParametersInterceptorTest.java | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/9884c49f/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java -- diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java index 359618f..a2aa92b 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java @@ -18,7 +18,6 @@ package com.opensymphony.xwork2.interceptor; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.ExcludedPatterns; import com.opensymphony.xwork2.ModelDrivenAction; import com.opensymphony.xwork2.SimpleAction; import com.opensymphony.xwork2.TestBean; @@ -47,12 +46,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /**
[30/50] [abbrv] git commit: Adds default param to reduce noise in the logs during building
Adds default param to reduce noise in the logs during building
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/086c0a0d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/086c0a0d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/086c0a0d
Branch: refs/heads/feature/http-interceptor
Commit: 086c0a0d5200acb04fe62eb86f5462d23d5891ba
Parents: d35072c
Author: Lukasz Lenart
Authored: Mon May 5 06:41:07 2014 +0200
Committer: Lukasz Lenart
Committed: Mon May 5 06:41:07 2014 +0200
--
.../src/main/java/com/opensymphony/xwork2/mock/MockResult.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/086c0a0d/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
index 53eac63..d988df5 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
@@ -26,6 +26,8 @@ import com.opensymphony.xwork2.Result;
*/
public class MockResult implements Result {
+public static final String DEFAULT_PARAM = null;
+
@Override
public boolean equals(Object o) {
if (this == o) {
[06/11] git commit: [maven-release-plugin] prepare release STRUTS_2_3_16_3
[maven-release-plugin] prepare release STRUTS_2_3_16_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e03ff728 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e03ff728 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e03ff728 Branch: refs/heads/master Commit: e03ff728618f5bf551083fc3a52d43c07434bbc9 Parents: 0761909 Author: Lukasz Lenart Authored: Fri May 2 17:10:41 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:41 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 81a88d5..b7343c6 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index b77c977..62c6803 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index bb7ae7c..c41bb76 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-mailreader http://git-wip-us.apache.org/repos/asf
[38/50] [abbrv] git commit: Merge branch 'develop' into feature/exclude-object-class
Merge branch 'develop' into feature/exclude-object-class Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/08b44fda Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/08b44fda Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/08b44fda Branch: refs/heads/feature/exclude-object-class Commit: 08b44fdad666c78e4a7a96c57bbe896eff896829 Parents: 7857b86 63897e8 Author: Lukasz Lenart Authored: Thu May 8 22:07:22 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 22:07:22 2014 +0200 -- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 2 files changed, 82 insertions(+), 16 deletions(-) --
[10/10] git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Conflicts: apps/blank/pom.xml apps/jboss-blank/pom.xml apps/mailreader/pom.xml apps/pom.xml apps/portlet/pom.xml apps/rest-showcase/pom.xml apps/showcase/pom.xml archetypes/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/pom.xml bundles/admin/pom.xml bundles/demo/pom.xml bundles/pom.xml core/pom.xml plugins/cdi/pom.xml plugins/codebehind/pom.xml plugins/config-browser/pom.xml plugins/convention/pom.xml plugins/dojo/pom.xml plugins/dwr/pom.xml plugins/embeddedjsp/pom.xml plugins/gxp/pom.xml plugins/jasperreports/pom.xml plugins/javatemplates/pom.xml plugins/jfreechart/pom.xml plugins/jsf/pom.xml plugins/json/pom.xml plugins/junit/pom.xml plugins/osgi/pom.xml plugins/oval/pom.xml plugins/pell-multipart/pom.xml plugins/plexus/pom.xml plugins/pom.xml plugins/portlet-tiles/pom.xml plugins/portlet/pom.xml plugins/rest/pom.xml plugins/sitegraph/pom.xml plugins/sitemesh/pom.xml plugins/spring/pom.xml plugins/struts1/pom.xml plugins/testng/pom.xml plugins/tiles/pom.xml plugins/tiles3/pom.xml pom.xml xwork-core/pom.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63897e83 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63897e83 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63897e83 Branch: refs/heads/develop Commit: 63897e83d98b4844982c2d96c3d20b4216ece28a Parents: 086c0a0 d2663ce Author: Lukasz Lenart Authored: Thu May 8 22:06:00 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 22:06:00 2014 +0200 -- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 2 files changed, 82 insertions(+), 16 deletions(-) --
[03/10] git commit: Uses wget to fetch docs instead re-exporting pages from wiki
Uses wget to fetch docs instead re-exporting pages from wiki
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/769e815c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/769e815c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/769e815c
Branch: refs/heads/develop
Commit: 769e815c6e0a72b25812ff1c4526105be9491e0c
Parents: 1a668af
Author: Lukasz Lenart
Authored: Fri May 2 15:35:31 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 15:35:31 2014 +0200
--
assembly/pom.xml | 86 +--
1 file changed, 36 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/769e815c/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7984c29..56a551b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -77,6 +77,42 @@
+maven-antrun-plugin
+
+
+cwiki-docs
+prepare-package
+
+run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://struts.apache.org/development/2.x/docs/"; />
+
+
+
+
+
+
+
+
+
+
+
+
maven-assembly-plugin
@@ -103,59 +139,9 @@
-
-
-export-cwiki
-
-
-!skipWiki
-
-
-
-
-
-org.codehaus.mojo
-exec-maven-plugin
-1.2
-
-
-cwiki-docs
-prepare-package
-
-java
-
-
-runtime
-
true
-
org.apache.cxf.cwiki.SiteExporter
-
--d
-
${project.build.directory}/cwiki/WW
--password
-
${confluence.password}
--user
-${confluence.user}
-
${basedir}/src/main/resources/docs.cfg
-
-
-
-
-
-
-
-
-
-
-org.apache.cxf.site-export
-cxf-site-export
-1.0-SNAPSHOT
-runtime
-
-
-
org.apache.struts
struts2-cdi-plugin
[08/11] git commit: Adds logging of excluded classes
Adds logging of excluded classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/62ee6b10
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/62ee6b10
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/62ee6b10
Branch: refs/heads/feature/exclude-object-class
Commit: 62ee6b104ae871807ff073eb206b5f3ec549a302
Parents: a5946d0
Author: Lukasz Lenart
Authored: Mon May 5 21:33:16 2014 +0200
Committer: Lukasz Lenart
Committed: Mon May 5 21:33:16 2014 +0200
--
.../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/62ee6b10/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index a35f68b..c14d8b9 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -15,13 +15,14 @@
*/
package com.opensymphony.xwork2.ognl;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import ognl.DefaultMemberAccess;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
@@ -33,6 +34,8 @@ import java.util.regex.Pattern;
*/
public class SecurityMemberAccess extends DefaultMemberAccess {
+private static final Logger LOG =
LoggerFactory.getLogger(SecurityMemberAccess.class);
+
private final boolean allowStaticMethodAccess;
private Set excludeProperties = Collections.emptySet();
private Set acceptProperties = Collections.emptySet();
@@ -50,6 +53,9 @@ public class SecurityMemberAccess extends DefaultMemberAccess
{
@Override
public boolean isAccessible(Map context, Object target, Member member,
String propertyName) {
if (isClassExcluded(target.getClass(), member.getDeclaringClass())) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Target class [#0] and member type [#1] are
excluded!", target, member);
+}
return false;
}
[05/11] git commit: Updates docs assembly with new location of exported pages
Updates docs assembly with new location of exported pages Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0761909c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0761909c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0761909c Branch: refs/heads/master Commit: 0761909c65f32a0df9fc392704bf9d248bfea2c8 Parents: bca525d Author: Lukasz Lenart Authored: Fri May 2 15:47:34 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:47:34 2014 +0200 -- assembly/src/main/assembly/docs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0761909c/assembly/src/main/assembly/docs.xml -- diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 77dffcb..b1f9991 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -47,7 +47,7 @@ -target/cwiki/WW/docs +target/cwiki/ docs
[10/11] git commit: Merge branch 'hotfix/2.3.16.3'
Merge branch 'hotfix/2.3.16.3' Conflicts: apps/rest-showcase/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/src/main/assembly/docs.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/38a3f8bf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/38a3f8bf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/38a3f8bf Branch: refs/heads/master Commit: 38a3f8bfb6b226db3adb44a8fc4ad0850feee54f Parents: c9fd44f bcffc25 Author: Lukasz Lenart Authored: Thu May 8 21:55:35 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:55:35 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- archetypes/struts2-archetype-blank/pom.xml | 3 +- archetypes/struts2-archetype-convention/pom.xml | 3 +- archetypes/struts2-archetype-dbportlet/pom.xml | 3 +- archetypes/struts2-archetype-plugin/pom.xml | 3 +- archetypes/struts2-archetype-portlet/pom.xml| 3 +- archetypes/struts2-archetype-starter/pom.xml| 3 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 53 files changed, 142 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/blank/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/jboss-blank/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/mailreader/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/pom.xml -- diff --cc apps/pom.xml index ac06753,d0a24d0..5860c18 --- a/apps/pom.xml +++ b/apps/pom.xml @@@ -26,11 -26,12 +26,11 @@@ org.apac
[07/50] [abbrv] git commit: [maven-release-plugin] prepare release STRUTS_2_3_16_2
[maven-release-plugin] prepare release STRUTS_2_3_16_2 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7dd83dff Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7dd83dff Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7dd83dff Branch: refs/heads/feature/http-interceptor Commit: 7dd83dff485d324980f3d22c726cfd969ecf41f8 Parents: 7809666 Author: Lukasz Lenart Authored: Thu Apr 24 21:32:35 2014 +0200 Committer: Lukasz Lenart Committed: Thu Apr 24 21:32:35 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 5 +++-- xwork-core/pom.xml | 2 +- 51 files changed, 62 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index dce8aa0..6054fc4 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2-SNAPSHOT +2.3.16.2 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 9a6abee..0aebae0 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2-SNAPSHOT +2.3.16.2 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/7dd83dff/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index de7cfb2..f2fc344 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2-SNAPSHOT + 2.3.16.2 struts2-mailreader http://git-wip-us
[44/50] [abbrv] git commit: Extracts interface to simplify implementation by users
Extracts interface to simplify implementation by users
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bfbc4c04
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bfbc4c04
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bfbc4c04
Branch: refs/heads/feature/exclude-object-class
Commit: bfbc4c04e007393986f374a02dfb7ded23bc9a05
Parents: ba1850a
Author: Lukasz Lenart
Authored: Tue May 13 20:29:21 2014 +0200
Committer: Lukasz Lenart
Committed: Tue May 13 20:29:21 2014 +0200
--
core/src/main/resources/struts-default.xml | 2 +-
.../interceptor/CookieInterceptorTest.java | 20 ++---
.../xwork2/DefaultExcludedPatternsChecker.java | 93
.../xwork2/ExcludedPatternsChecker.java | 92 +--
4 files changed, 106 insertions(+), 101 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/bfbc4c04/core/src/main/resources/struts-default.xml
--
diff --git a/core/src/main/resources/struts-default.xml
b/core/src/main/resources/struts-default.xml
index 554a8ba..f2fb922 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,7 +144,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/struts/blob/bfbc4c04/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index 2bbaef9..1f642f5 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -27,7 +27,7 @@ import java.util.Map;
import javax.servlet.http.Cookie;
-import com.opensymphony.xwork2.ExcludedPatternsChecker;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -66,7 +66,7 @@ public class CookieInterceptorTest extends
StrutsInternalTestCase {
// by default the interceptor doesn't accept any cookies
CookieInterceptor interceptor = new CookieInterceptor();
-interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+interceptor.setExcludedPatternsChecker(new
DefaultExcludedPatternsChecker());
interceptor.intercept(invocation);
@@ -102,7 +102,7 @@ public class CookieInterceptorTest extends
StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
-interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+interceptor.setExcludedPatternsChecker(new
DefaultExcludedPatternsChecker());
interceptor.setCookiesName("*");
interceptor.setCookiesValue("*");
interceptor.intercept(invocation);
@@ -144,7 +144,7 @@ public class CookieInterceptorTest extends
StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
-interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+interceptor.setExcludedPatternsChecker(new
DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie2, cookie3");
interceptor.setCookiesValue("cookie1value, cookie2value,
cookie3value");
interceptor.intercept(invocation);
@@ -185,7 +185,7 @@ public class CookieInterceptorTest extends
StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
-interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+interceptor.setExcludedPatternsChecker(new
DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("cookie1value, cookie2value,
cookie3value");
interceptor.intercept(invocation);
@@ -226,7 +226,7 @@ public class CookieInterceptorTest extends
StrutsInternalTestCase {
actionInvocationControl.replay();
CookieInterceptor interceptor = new CookieInterceptor();
-interceptor.setExcludedPatternsChecker(new ExcludedPatternsChecker());
+interceptor.setExcludedPatternsChecker(new
DefaultExcludedPatternsChecker());
interceptor.setCookiesName("cookie1, cookie3");
interceptor.setCookiesValue("*");
interceptor.intercept(invocation);
@@ -267,7 +267,7
