struts git commit: WW-4522 Support latest stable AngularJS version in maven angularjs archetype
Repository: struts
Updated Branches:
refs/heads/master cd4eb6f26 -> 43c030941
WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Correct redirect to index action
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/43c03094
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/43c03094
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/43c03094
Branch: refs/heads/master
Commit: 43c03094100a457b8f33802b8b3886ee79c84402
Parents: cd4eb6f
Author: Johannes Geppert
Authored: Mon Sep 28 19:53:26 2015 +0200
Committer: Johannes Geppert
Committed: Mon Sep 28 19:53:26 2015 +0200
--
.../main/resources/archetype-resources/src/main/webapp/index.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/43c03094/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
index 3fa05a5..a81b87f 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/index.jsp
@@ -1 +1 @@
-<% response.sendRedirect("application"); %>
\ No newline at end of file
+<% response.sendRedirect("index"); %>
\ No newline at end of file
[3/8] struts git commit: Updates bom
Updates bom Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/27f451d9 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/27f451d9 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/27f451d9 Branch: refs/heads/master Commit: 27f451d99a110907968c438fd0237b06088fb9dd Parents: 0cefe50 Author: Lukasz Lenart Authored: Tue Sep 22 07:41:42 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 22 07:41:42 2015 +0200 -- bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/27f451d9/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index cee1958..21863bb 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom -2.3.24 +2.3.24.1-SNAPSHOT pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ -2.3.24 +2.3.24.1
[4/8] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_24_1
[maven-release-plugin] prepare release STRUTS_2_3_24_1 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7a986316 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7a986316 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7a986316 Branch: refs/heads/master Commit: 7a9863169f7d981be0d2d57437974ae2cc0c8bd3 Parents: 27f451d Author: Lukasz Lenart Authored: Tue Sep 22 07:49:22 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 22 07:49:22 2015 +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 +- bom/pom.xml | 4 ++-- 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/java8-support/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| 2 +- 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 +- 53 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/7a986316/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 369de8d..85ff76f 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.1-SNAPSHOT +2.3.24.1 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/7a986316/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index a12e542..3f29927 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.1-SNAPSHOT +2.3.24.1 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/7a986316/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 92a74aa..3b7e5cf 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.2
[2/8] struts git commit: Sets SNAPSHOT version
Sets SNAPSHOT version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0cefe507 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0cefe507 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0cefe507 Branch: refs/heads/master Commit: 0cefe507fb757cc2f53ae87c54fbbec271a265c4 Parents: f420f28 Author: Lukasz Lenart Authored: Tue Sep 22 07:39:39 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 22 07:39:39 2015 +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/java8-support/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| 2 +- 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 +- 52 files changed, 53 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0cefe507/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 530283b..369de8d 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24 +2.3.24.1-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/0cefe507/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 6877f52..a12e542 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24 +2.3.24.1-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/0cefe507/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index b7b9631..92a74aa 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.24 + 2.3.24.1-SNAPSHOT struts2-mailreader http://git-wip-us.apache.org/repos/as
[8/8] struts git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/48ea26be Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/48ea26be Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/48ea26be Branch: refs/heads/master Commit: 48ea26be79bc54286ce50ec72aa6c53fee17b1bf Parents: db62a57 43c0309 Author: Lukasz Lenart Authored: Mon Sep 28 20:42:36 2015 +0200 Committer: Lukasz Lenart Committed: Mon Sep 28 20:42:36 2015 +0200 -- .../main/resources/archetype-resources/pom.xml | 14 ++- .../main/java/actions/ApplicationAction.java| 44 .../src/main/java/actions/Index.java| 26 +--- .../main/java/actions/data/ProjectsAction.java | 2 - .../main/java/actions/data/package-info.java| 24 +++ .../src/main/resources/struts.xml | 4 +- .../main/webapp/WEB-INF/content/application.jsp | 38 - .../src/main/webapp/WEB-INF/content/index.jsp | 38 + .../src/main/webapp/index.jsp | 2 +- .../java/actions/ApplicationActionTest.java | 32 -- .../src/test/java/actions/IndexTest.java| 13 +++--- .../src/main/resources/struts-plugin.xml| 41 ++ .../rest/src/main/resources/struts-plugin.xml | 4 +- 13 files changed, 131 insertions(+), 151 deletions(-) --
[7/8] struts git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/db62a57b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/db62a57b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/db62a57b Branch: refs/heads/master Commit: db62a57bcb174a288a4cd706f4ade7875a332846 Parents: dc270c2 18fc7eb Author: Lukasz Lenart Authored: Wed Sep 23 08:56:51 2015 +0200 Committer: Lukasz Lenart Committed: Wed Sep 23 08:56:51 2015 +0200 -- .../WEB-INF/content/orders-deleteConfirm.jsp|2 + .../main/webapp/WEB-INF/content/orders-edit.jsp |8 + .../webapp/WEB-INF/content/orders-editNew.jsp |9 +- .../webapp/WEB-INF/content/orders-index.jsp |2 + .../main/webapp/WEB-INF/content/orders-show.jsp |2 + apps/rest-showcase/src/main/webapp/css/app.css |5 + .../webapp/js/lib/angular/angular-animate.js| 773 - .../js/lib/angular/angular-animate.min.js | 98 +- .../js/lib/angular/angular-animate.min.js.map |6 +- .../main/webapp/js/lib/angular/angular-aria.js |2 +- .../webapp/js/lib/angular/angular-aria.min.js |2 +- .../webapp/js/lib/angular/angular-cookies.js|4 +- .../js/lib/angular/angular-cookies.min.js |2 +- .../webapp/js/lib/angular/angular-loader.js |9 +- .../webapp/js/lib/angular/angular-loader.min.js |9 +- .../js/lib/angular/angular-loader.min.js.map|6 +- .../js/lib/angular/angular-message-format.js|2 +- .../lib/angular/angular-message-format.min.js |2 +- .../webapp/js/lib/angular/angular-messages.js |2 +- .../js/lib/angular/angular-messages.min.js |2 +- .../main/webapp/js/lib/angular/angular-mocks.js | 104 +- .../webapp/js/lib/angular/angular-resource.js | 12 +- .../js/lib/angular/angular-resource.min.js | 16 +- .../js/lib/angular/angular-resource.min.js.map |4 +- .../main/webapp/js/lib/angular/angular-route.js |7 +- .../webapp/js/lib/angular/angular-route.min.js |2 +- .../js/lib/angular/angular-route.min.js.map |2 +- .../webapp/js/lib/angular/angular-sanitize.js |4 +- .../js/lib/angular/angular-sanitize.min.js |2 +- .../webapp/js/lib/angular/angular-scenario.js | 1068 +++-- .../main/webapp/js/lib/angular/angular-touch.js |2 +- .../webapp/js/lib/angular/angular-touch.min.js |2 +- .../src/main/webapp/js/lib/angular/angular.js | 1070 -- .../main/webapp/js/lib/angular/angular.min.js | 559 - .../webapp/js/lib/angular/angular.min.js.map|6 +- .../src/main/webapp/js/lib/angular/errors.json |2 +- .../js/lib/angular/i18n/angular-locale_af-na.js |4 +- .../js/lib/angular/i18n/angular-locale_af-za.js |2 +- .../js/lib/angular/i18n/angular-locale_af.js|2 +- .../js/lib/angular/i18n/angular-locale_ak-gh.js |2 +- .../js/lib/angular/i18n/angular-locale_ak.js|2 +- .../js/lib/angular/i18n/angular-locale_am-et.js |2 +- .../js/lib/angular/i18n/angular-locale_am.js|2 +- .../lib/angular/i18n/angular-locale_ar-001.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-ae.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-bh.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-dj.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-dz.js | 10 +- .../js/lib/angular/i18n/angular-locale_ar-eg.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-eh.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-er.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-il.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-iq.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-jo.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-km.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-kw.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-lb.js |6 +- .../js/lib/angular/i18n/angular-locale_ar-ly.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-ma.js | 10 +- .../js/lib/angular/i18n/angular-locale_ar-mr.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-om.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-ps.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-qa.js |8 +- .../js/lib/angular/i18n/angular-locale_ar-sa.js |8 +- .../js/lib/angular/i18n/angular-locale_ar-sd.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-so.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-ss.js |4 +- .../js/lib/angular/i18n/angular-locale_ar-sy.js |8 +- .../js/lib/angular/i18n/angular-locale_ar-td.js |2 +- .../js/lib/angular/i18n/angular-locale_ar-tn.js | 16 +- .../js/lib/angular/i18n/angular-locale_ar-ye.js |8 +- .../js/lib/angular/i18n/angular-locale_ar.js|2 +- .../js/lib/angular/i18n/angular-locale_as-in.js |2 +- .../js
[6/8] struts git commit: Merges security fixes from 2.3.24.1
Merges security fixes from 2.3.24.1
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
bom/pom.xml
bundles/admin/pom.xml
bundles/demo/pom.xml
bundles/pom.xml
core/pom.xml
plugins/bean-validation/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/java8-support/pom.xml
plugins/javatemplates/pom.xml
plugins/jfreechart/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/dc270c2e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dc270c2e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dc270c2e
Branch: refs/heads/master
Commit: dc270c2e09f944c9ed8936cb0a74cd2dfadacf81
Parents: 0fac539 bfe51fc
Author: Lukasz Lenart
Authored: Wed Sep 23 08:42:01 2015 +0200
Committer: Lukasz Lenart
Committed: Wed Sep 23 08:42:01 2015 +0200
--
.../DefaultExcludedPatternsChecker.java | 2 +-
.../interceptor/ParametersInterceptorTest.java | 6 ++--
.../DefaultExcludedPatternsCheckerTest.java | 35
3 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/dc270c2e/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
--
diff --cc
core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index f6d48cd,000..13e091e
mode 100644,00..100644
---
a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++
b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@@ -1,77 -1,0 +1,77 @@@
+package com.opensymphony.xwork2.security;
+
+import com.opensymphony.xwork2.XWorkConstants;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
+
+private static final Logger LOG =
LogManager.getLogger(DefaultExcludedPatternsChecker.class);
+
+public static final String[] EXCLUDED_PATTERNS = {
-
"(^|.*#)(dojo|struts|session|request|application|servlet(Request|Response)|parameters|context|_memberAccess)(\\.|\\[).*",
++
"(^|\\%\\{)((#?)(top(\\.|\\['|\\[\")|\\[\\d\\]\\.)?)(dojo|struts|session|request|response|application|servlet(Request|Response|Context)|parameters|context|_memberAccess)(\\.|\\[).*",
+"^(action|method):.*"
+};
+
+private Set excludedPatterns;
+
+public DefaultExcludedPatternsChecker() {
+setExcludedPatterns(EXCLUDED_PATTERNS);
+}
+
+@Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required =
false)
+public void setOverrideExcludePatterns(String excludePatterns) {
+LOG.warn("Overriding excluded patterns [{}] with [{}], be aware that
this affects all instances and safety of your application!",
+XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS,
excludePatterns);
+excludedPatterns = new HashSet();
+for (String pattern :
TextParseUtil.commaDelimitedStringToSet(excludePatterns)) {
+
[1/8] struts git commit: Solves issue with vulnerable parameters
Repository: struts
Updated Branches:
refs/heads/master 43c030941 -> 48ea26be7
Solves issue with vulnerable parameters
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f420f284
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f420f284
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f420f284
Branch: refs/heads/master
Commit: f420f28466cb82915defc4e12466b298c275abaf
Parents: 925741a
Author: Lukasz Lenart
Authored: Tue Sep 22 07:24:49 2015 +0200
Committer: Lukasz Lenart
Committed: Tue Sep 22 07:24:49 2015 +0200
--
.../DefaultExcludedPatternsChecker.java | 2 +-
.../interceptor/ParametersInterceptorTest.java | 6 ++--
.../DefaultExcludedPatternsCheckerTest.java | 35
3 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/f420f284/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index d96b67a..93d72ca 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -16,7 +16,7 @@ public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
public static final String[] EXCLUDED_PATTERNS = {
-
"(^|.*#)(dojo|struts|session|request|application|servlet(Request|Response)|parameters|context|_memberAccess)(\\.|\\[).*",
+
"(^|\\%\\{)((#?)(top(\\.|\\['|\\[\")|\\[\\d\\]\\.)?)(dojo|struts|session|request|response|application|servlet(Request|Response|Context)|parameters|context|_memberAccess)(\\.|\\[).*",
"^(action|method):.*"
};
http://git-wip-us.apache.org/repos/asf/struts/blob/f420f284/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 f20e178..5dcc3e0 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
@@ -110,11 +110,13 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
pi.setParameters(action, vs, params);
// then
-assertEquals(1, action.getActionMessages().size());
+assertEquals(2, action.getActionMessages().size());
String msg1 = action.getActionMessage(0);
+String msg2 = action.getActionMessage(1);
-assertTrue(msg1.contains("Error setting expression 'top['name'](0)'
with value 'true'"));
+assertEquals("Error setting expression 'name' with value
'(#context[\"xwork.MethodAccessor.denyMethodExecution\"]= new
java.lang.Boolean(false), #_memberAccess[\"allowStaticMethodAccess\"]= new
java.lang.Boolean(true), @java.lang.Runtime@getRuntime().exec('mkdir
/tmp/PWNAGE'))(meh)'", msg1);
+assertEquals("Error setting expression 'top['name'](0)' with value
'true'", msg2);
assertNull(action.getName());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/f420f284/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
index 22e4a73..d917808 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
@@ -3,6 +3,7 @@ package com.opensymphony.xwork2.security;
import com.opensymphony.xwork2.XWorkTestCase;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
@@ -35,6 +36,10 @@ public class DefaultExcludedPatternsCheckerTest extends
XWorkTestCase {
add("%{#servletResponse.test}");
add("%{#ServletResponse['t
[5/8] struts git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bfe51fcb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bfe51fcb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bfe51fcb Branch: refs/heads/master Commit: bfe51fcb7f536feae4ad24671fe319d9c5d9a38d Parents: 7a98631 Author: Lukasz Lenart Authored: Tue Sep 22 07:49:39 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 22 07:49:39 2015 +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 +- bom/pom.xml | 6 +++--- 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/java8-support/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| 2 +- 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 +- 53 files changed, 57 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bfe51fcb/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 85ff76f..33395d2 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.1 +2.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bfe51fcb/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 3f29927..626c588 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.1 +2.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bfe51fcb/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 3b7e5cf..972d17c 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.24
Git Push Summary
Repository: struts Updated Branches: refs/heads/release-2-3-24-1 [deleted] bfe51fcb7
[07/33] struts git commit: Fixes tests
Fixes tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c3f4457b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c3f4457b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c3f4457b
Branch: refs/heads/master
Commit: c3f4457b8b8ad6bd0e89646d825f2ef5f9f91118
Parents: 4565993
Author: Lukasz Lenart
Authored: Mon Aug 31 14:43:31 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 14:43:31 2015 +0200
--
.../opensymphony/xwork2/DefaultActionProxy.java | 11 ++-
.../opensymphony/xwork2/ActionInvocationTest.java | 18 ++
.../config/providers/SomeUnknownHandler.java | 5 +
core/src/test/resources/xwork-sample.xml | 6 --
4 files changed, 29 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c3f4457b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
index d1bfd71..6b8749e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
@@ -194,12 +194,13 @@ public class DefaultActionProxy implements ActionProxy,
Serializable {
resolveMethod();
-if (!config.isAllowedMethod(method)) {
-throw new ConfigurationException("Invalid method: " + method +
" for action " + actionName);
+if (config.isAllowedMethod(method) ||
+(unknownHandlerManager.hasUnknownHandlers() &&
unknownHandlerManager.isAllowedMethod(method, config))
+) {
+invocation.init(this);
+} else {
+throw new ConfigurationException("This method: " + method + "
for action " + actionName + " is not allowed!");
}
-
-invocation.init(this);
-
} finally {
UtilTimerStack.pop(profileKey);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/c3f4457b/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
b/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
index 05c09b2..37aa2a5 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
@@ -17,6 +17,7 @@ package com.opensymphony.xwork2;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.mock.MockResult;
import java.util.HashMap;
@@ -45,12 +46,12 @@ public class ActionInvocationTest extends XWorkTestCase {
public void testCommandInvocationUnknownHandler() throws Exception {
-DefaultActionProxy baseActionProxy = (DefaultActionProxy)
actionProxyFactory.createActionProxy(
-"baz", "unknownMethodTest", "unknownmethod", null);
UnknownHandler unknownHandler = new UnknownHandler() {
- public ActionConfig handleUnknownAction(String
namespace, String actionName) throws XWorkException { return null;}
+ public ActionConfig handleUnknownAction(String
namespace, String actionName) throws XWorkException {
+return new ActionConfig.Builder("test", actionName,
ActionSupport.class.getName()).build();
+}
public Result handleUnknownResult(ActionContext
actionContext, String actionName, ActionConfig actionConfig, String resultCode)
throws XWorkException {
- return null;
+ return new MockResult();
}
public Object handleUnknownActionMethod(Object action,
String methodName) {
if (methodName.equals("unknownmethod")) {
@@ -59,10 +60,19 @@ public class ActionInvocationTest extends XWorkTestCase {
return null;
}
}
+public boolean isAllowedMethod(String allowedMethod, ActionConfig
actionConfig) {
+return "unknownmethod".equals(allowedMethod);
+}
};
UnknownHandlerManagerMock uhm = new UnknownHandlerManagerMock();
uhm.addUnknownHandler(unknownHandler);
+
+loadButAdd(UnknownHandlerManager.class, uhm);
+
+DefaultActionProxy baseActionProxy = (DefaultActionProxy)
ac
[05/33] struts git commit: Drops outdated attribute
Drops outdated attribute
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fb0c4a58
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fb0c4a58
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fb0c4a58
Branch: refs/heads/master
Commit: fb0c4a58507c7fb1af135bb376af5b475f43d7ee
Parents: 55b8070
Author: Lukasz Lenart
Authored: Mon Aug 31 14:42:44 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 14:42:44 2015 +0200
--
.../xwork2/config/providers/XmlConfigurationProvider.java | 5 -
core/src/main/resources/struts-2.5.dtd | 1 -
2 files changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fb0c4a58/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 449d254..fd9f92a 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -649,11 +649,6 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
String name =
StringUtils.defaultString(packageElement.getAttribute("name"));
String namespace =
StringUtils.defaultString(packageElement.getAttribute("namespace"));
-if
(StringUtils.isNotEmpty(packageElement.getAttribute("externalReferenceResolver")))
{
-throw new ConfigurationException("The 'externalReferenceResolver'
attribute has been removed. Please use " +
-"a custom ObjectFactory or Interceptor.", packageElement);
-}
-
PackageConfig.Builder cfg = new PackageConfig.Builder(name)
.namespace(namespace)
.isAbstract(isAbstract)
http://git-wip-us.apache.org/repos/asf/struts/blob/fb0c4a58/core/src/main/resources/struts-2.5.dtd
--
diff --git a/core/src/main/resources/struts-2.5.dtd
b/core/src/main/resources/struts-2.5.dtd
index 86afbc0..25ca800 100644
--- a/core/src/main/resources/struts-2.5.dtd
+++ b/core/src/main/resources/struts-2.5.dtd
@@ -43,7 +43,6 @@
extends CDATA #IMPLIED
namespace CDATA #IMPLIED
abstract CDATA #IMPLIED
-externalReferenceResolver NMTOKEN #IMPLIED
>
[12/33] struts git commit: Adds missing comma
Adds missing comma Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63bb6e30 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63bb6e30 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63bb6e30 Branch: refs/heads/master Commit: 63bb6e30e75facf5382608857494cf971f0378dd Parents: 47a01ea Author: Lukasz Lenart Authored: Mon Aug 31 21:06:06 2015 +0200 Committer: Lukasz Lenart Committed: Mon Aug 31 21:06:06 2015 +0200 -- core/src/main/resources/struts-2.5.dtd | 2 +- core/src/main/resources/struts-default.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/63bb6e30/core/src/main/resources/struts-2.5.dtd -- diff --git a/core/src/main/resources/struts-2.5.dtd b/core/src/main/resources/struts-2.5.dtd index 6591ddb..0845eee 100644 --- a/core/src/main/resources/struts-2.5.dtd +++ b/core/src/main/resources/struts-2.5.dtd @@ -37,7 +37,7 @@ order CDATA #IMPLIED > - + http://git-wip-us.apache.org/repos/asf/struts/blob/63bb6e30/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 d7a0ee0..f1684e5 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -358,11 +358,12 @@ - execute,input,back,cancel,browse - + + execute,input,back,cancel,browse +
[06/33] struts git commit: Extends Unknown Handler to allowed check if method is allowed
Extends Unknown Handler to allowed check if method is allowed
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/45659934
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/45659934
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/45659934
Branch: refs/heads/master
Commit: 4565993463f660e9be90b9fe9c3597ce54b58917
Parents: fb0c4a5
Author: Lukasz Lenart
Authored: Mon Aug 31 14:43:21 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 14:43:21 2015 +0200
--
.../opensymphony/xwork2/DefaultUnknownHandlerManager.java | 10 ++
.../main/java/com/opensymphony/xwork2/UnknownHandler.java | 10 ++
.../com/opensymphony/xwork2/UnknownHandlerManager.java| 3 +++
3 files changed, 23 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/45659934/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
index 5cafe9a..04ac430 100644
---
a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
+++
b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
@@ -145,4 +145,14 @@ public class DefaultUnknownHandlerManager implements
UnknownHandlerManager {
public List getUnknownHandlers() {
return unknownHandlers;
}
+
+@Override
+public boolean isAllowedMethod(String allowedMethod, ActionConfig config) {
+for (UnknownHandler unknownHandler : unknownHandlers) {
+if (unknownHandler.isAllowedMethod(allowedMethod, config)) {
+return true;
+}
+}
+return false;
+}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/45659934/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
index 51556d6..1e6f5aa 100644
--- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
+++ b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
@@ -60,4 +60,14 @@ public interface UnknownHandler {
*/
Object handleUnknownActionMethod(Object action, String methodName);
+/**
+ * Handles the case when an action method is unknown and cannot be
validated if it is allowed to be executed.
+ *
+ * @since 2.5
+ * @param allowedMethod The method's name
+ * @param actionConfig The config of actions
+ * @return true if allowedMethod can be executed, false otherwise
+ */
+boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig);
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/45659934/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
index f5e2542..caf63b3 100644
--- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
@@ -43,4 +43,7 @@ public interface UnknownHandlerManager {
boolean hasUnknownHandlers();
List getUnknownHandlers();
+
+boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig);
+
}
[01/33] struts git commit: Drops wildcard as a valid action method
Repository: struts
Updated Branches:
refs/heads/master 48ea26be7 -> b88268165
Drops wildcard as a valid action method
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/065b5b79
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/065b5b79
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/065b5b79
Branch: refs/heads/master
Commit: 065b5b79ae068ab7891a4232a0769290fd21bb17
Parents: 0fac539
Author: Lukasz Lenart
Authored: Mon Aug 31 14:31:59 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 14:31:59 2015 +0200
--
.../xwork2/config/entities/ActionConfig.java| 40 +++-
1 file changed, 13 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/065b5b79/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index b32f2cf..b947ed9 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -42,7 +42,6 @@ import java.util.*;
public class ActionConfig extends Located implements Serializable {
public static final String DEFAULT_METHOD = "execute";
-public static final String WILDCARD = "*";
protected List interceptors; // a list of
interceptorMapping Objects eg. List
protected Map params;
@@ -58,11 +57,11 @@ public class ActionConfig extends Located implements
Serializable {
this.packageName = packageName;
this.name = name;
this.className = className;
-params = new LinkedHashMap();
-results = new LinkedHashMap();
-interceptors = new ArrayList();
-exceptionMappings = new ArrayList();
-allowedMethods = new HashSet();
+params = new LinkedHashMap<>();
+results = new LinkedHashMap<>();
+interceptors = new ArrayList<>();
+exceptionMappings = new ArrayList<>();
+allowedMethods = new
HashSet<>(Collections.singletonList(DEFAULT_METHOD));
}
/**
@@ -128,11 +127,7 @@ public class ActionConfig extends Located implements
Serializable {
}
public boolean isAllowedMethod(String method) {
-if (allowedMethods.size() == 1 &&
WILDCARD.equals(allowedMethods.iterator().next())) {
-return true;
-} else {
-return method.equals(methodName != null ? methodName :
DEFAULT_METHOD) || allowedMethods.contains(method);
-}
+return method.equals(methodName != null ? methodName : DEFAULT_METHOD)
|| allowedMethods.contains(method);
}
@Override public boolean equals(Object o) {
@@ -214,7 +209,6 @@ public class ActionConfig extends Located implements
Serializable {
public static class Builder implements InterceptorListHolder{
protected ActionConfig target;
-private boolean gotMethods;
public Builder(ActionConfig toClone) {
target = new ActionConfig(toClone);
@@ -249,6 +243,7 @@ public class ActionConfig extends Located implements
Serializable {
public Builder methodName(String method) {
target.methodName = method;
+addAllowedMethod(method);
return this;
}
@@ -317,10 +312,7 @@ public class ActionConfig extends Located implements
Serializable {
}
public Builder addAllowedMethod(Collection methods) {
-if (methods != null) {
-gotMethods = true;
-target.allowedMethods.addAll(methods);
-}
+target.allowedMethods.addAll(methods);
return this;
}
@@ -330,22 +322,16 @@ public class ActionConfig extends Located implements
Serializable {
}
public ActionConfig build() {
-embalmTarget();
-ActionConfig result = target;
-target = new ActionConfig(target);
-return result;
-}
-
-protected void embalmTarget() {
-if (!gotMethods && target.allowedMethods.isEmpty()) {
-target.allowedMethods.add(WILDCARD);
-}
-
target.params = Collections.unmodifiableMap(target.params);
target.results = Collections.unmodifiableMap(target.results);
target.interceptors =
Collections.unmodifiableList(target.interceptors);
target.exceptionMappings =
Collections.unmodifiableList(target.exceptionMappings);
target.allowedMethods =
Collections.unmodifiableSet(target.allowedMethods);
+
+ActionConfig res
[13/33] struts git commit: Adds null-safety
Adds null-safety
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4c7a7dd6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4c7a7dd6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4c7a7dd6
Branch: refs/heads/master
Commit: 4c7a7dd6c02457cf006318ed4621b7c432cc478c
Parents: 63bb6e3
Author: Lukasz Lenart
Authored: Mon Aug 31 21:46:16 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 21:46:16 2015 +0200
--
.../com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4c7a7dd6/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
b/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
index bb97ce8..7f17e41 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
@@ -77,7 +77,7 @@ public class ActionConfigMatcher extends
AbstractMatcher implement
Map vars) {
String methodName = convertParam(orig.getMethodName(), vars);
-if (!orig.isAllowedMethod(methodName)) {
+if (methodName != null && !orig.isAllowedMethod(methodName)) {
return null;
}
[11/33] struts git commit: Fixes typo
Fixes typo
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47a01eab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47a01eab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47a01eab
Branch: refs/heads/master
Commit: 47a01eab10d940fdc134cb666d3d2db0280d8ca8
Parents: 1855304
Author: Lukasz Lenart
Authored: Mon Aug 31 20:28:45 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 20:28:45 2015 +0200
--
.../xwork2/config/providers/XmlConfigurationProvider.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/47a01eab/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 0d64ad7..0302a68 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -548,7 +548,7 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
loadGlobalAllowedMethods(newPackage, packageElement);
// load the global exception handler list for this package
-loadGobalExceptionMappings(newPackage, packageElement);
+loadGlobalExceptionMappings(newPackage, packageElement);
// get actions
NodeList actionList = packageElement.getElementsByTagName("action");
@@ -922,7 +922,7 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
* @param packageContext the package context
* @param packageElement the given XML element
*/
-protected void loadGobalExceptionMappings(PackageConfig.Builder
packageContext, Element packageElement) {
+protected void loadGlobalExceptionMappings(PackageConfig.Builder
packageContext, Element packageElement) {
NodeList globalExceptionMappingList =
packageElement.getElementsByTagName("global-exception-mappings");
if (globalExceptionMappingList.getLength() > 0) {
[20/33] struts git commit: Adds toString implementations
Adds toString implementations
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f1dbc5a7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f1dbc5a7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f1dbc5a7
Branch: refs/heads/master
Commit: f1dbc5a71914f4159d9aa0f0a8b6c8bfbd37f864
Parents: cb06d7d
Author: Lukasz Lenart
Authored: Fri Sep 4 09:24:11 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 09:24:11 2015 +0200
--
.../xwork2/config/entities/AllowedMethods.java | 15 +++
1 file changed, 15 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/f1dbc5a7/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
index 7582696..e8796b1 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
@@ -117,6 +117,14 @@ public class AllowedMethods {
public int hashCode() {
return original.hashCode();
}
+
+@Override
+public String toString() {
+return "PatternAllowedMethod{" +
+"allowedMethodPattern=" + allowedMethodPattern +
+", original='" + original + '\'' +
+'}';
+}
}
private static class LiteralAllowedMethod implements AllowedMethod {
@@ -152,6 +160,13 @@ public class AllowedMethods {
public int hashCode() {
return allowedMethod.hashCode();
}
+
+@Override
+public String toString() {
+return "LiteralAllowedMethod{" +
+"allowedMethod='" + allowedMethod + '\'' +
+'}';
+}
}
}
[15/33] struts git commit: Fixes test
Fixes test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dd406fbb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dd406fbb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dd406fbb
Branch: refs/heads/master
Commit: dd406fbb04e755c0545c318c3ea099674fb78363
Parents: 7769156
Author: Lukasz Lenart
Authored: Mon Aug 31 21:46:55 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 21:46:55 2015 +0200
--
.../src/test/java/org/apache/struts2/TestConfigurationProvider.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/dd406fbb/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
--
diff --git
a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index aee8473..0eebd85 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -127,6 +127,7 @@ public class TestConfigurationProvider implements
ConfigurationProvider {
.addActionConfig("testActionTagAction", new
ActionConfig.Builder("", "", TestAction.class.getName())
.addResultConfig(new ResultConfig.Builder(Action.SUCCESS,
TestActionTagResult.class.getName()).build())
.addResultConfig(new ResultConfig.Builder(Action.INPUT,
TestActionTagResult.class.getName()).build())
+.addAllowedMethod("input")
.build())
.build();
[30/33] struts git commit: Respects parent package flag when Strict DMI is disabled
Respects parent package flag when Strict DMI is disabled
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b8381057
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b8381057
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b8381057
Branch: refs/heads/master
Commit: b8381057190c3abebbc3a65c404fd5de5f2c6c52
Parents: e374311
Author: Lukasz Lenart
Authored: Wed Sep 23 11:30:54 2015 +0200
Committer: Lukasz Lenart
Committed: Wed Sep 23 11:30:54 2015 +0200
--
.../convention/PackageBasedActionConfigBuilder.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/b8381057/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index 0fc238c..c388ee9 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -921,9 +921,13 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
ActionConfig.Builder actionConfig = new
ActionConfig.Builder(pkgCfg.getName(), actionName, className);
actionConfig.methodName(actionMethod);
-actionConfig.addAllowedMethod(actionMethod);
-actionConfig.addAllowedMethod(allowedMethods);
-actionConfig.addAllowedMethod(pkgCfg.getGlobalAllowedMethods());
+if (pkgCfg.isStrictMethodInvocation()) {
+actionConfig.addAllowedMethod(actionMethod);
+actionConfig.addAllowedMethod(allowedMethods);
+actionConfig.addAllowedMethod(pkgCfg.getGlobalAllowedMethods());
+} else {
+actionConfig.addAllowedMethod(ActionConfig.REGEX_WILDCARD);
+}
if (LOG.isDebugEnabled()) {
LOG.debug("Creating action config for class [{}], name [{}] and
package name [{}] in namespace [{}]",
[26/33] struts git commit: Drops support for handleUnknownAllowedMethod as it was added to satisfy test
Drops support for handleUnknownAllowedMethod as it was added to satisfy test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a61a3692
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a61a3692
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a61a3692
Branch: refs/heads/master
Commit: a61a3692241d0da833139b9e4eab10a4a3e496aa
Parents: e9e6ae9
Author: Lukasz Lenart
Authored: Sun Sep 6 10:36:51 2015 +0200
Committer: Lukasz Lenart
Committed: Sun Sep 6 10:36:51 2015 +0200
--
.../java/com/opensymphony/xwork2/DefaultActionProxy.java | 4 +---
.../opensymphony/xwork2/DefaultUnknownHandlerManager.java | 9 -
.../main/java/com/opensymphony/xwork2/UnknownHandler.java | 10 --
.../com/opensymphony/xwork2/UnknownHandlerManager.java| 2 --
.../com/opensymphony/xwork2/ActionInvocationTest.java | 7 +++
.../xwork2/config/providers/SomeUnknownHandler.java | 5 -
.../struts2/convention/ConventionUnknownHandler.java | 4
7 files changed, 4 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
index 6b8749e..72c6e9e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
@@ -194,9 +194,7 @@ public class DefaultActionProxy implements ActionProxy,
Serializable {
resolveMethod();
-if (config.isAllowedMethod(method) ||
-(unknownHandlerManager.hasUnknownHandlers() &&
unknownHandlerManager.isAllowedMethod(method, config))
-) {
+if (config.isAllowedMethod(method)) {
invocation.init(this);
} else {
throw new ConfigurationException("This method: " + method + "
for action " + actionName + " is not allowed!");
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
index 04ac430..46af876 100644
---
a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
+++
b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
@@ -146,13 +146,4 @@ public class DefaultUnknownHandlerManager implements
UnknownHandlerManager {
return unknownHandlers;
}
-@Override
-public boolean isAllowedMethod(String allowedMethod, ActionConfig config) {
-for (UnknownHandler unknownHandler : unknownHandlers) {
-if (unknownHandler.isAllowedMethod(allowedMethod, config)) {
-return true;
-}
-}
-return false;
-}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
index 1e6f5aa..51556d6 100644
--- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
+++ b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
@@ -60,14 +60,4 @@ public interface UnknownHandler {
*/
Object handleUnknownActionMethod(Object action, String methodName);
-/**
- * Handles the case when an action method is unknown and cannot be
validated if it is allowed to be executed.
- *
- * @since 2.5
- * @param allowedMethod The method's name
- * @param actionConfig The config of actions
- * @return true if allowedMethod can be executed, false otherwise
- */
-boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig);
-
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
index caf63b3..d8cce9f 100644
--- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
@@ -44,6 +44,4 @@
[24/33] struts git commit: Adjusts tests
Adjusts tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3ccd7307
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3ccd7307
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3ccd7307
Branch: refs/heads/master
Commit: 3ccd7307f9af04d1f45a9ddd2360c390d83e13b0
Parents: 0aaade6
Author: Lukasz Lenart
Authored: Fri Sep 4 11:35:31 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 11:35:31 2015 +0200
--
.../XmlConfigurationProviderActionsTest.java| 16 ++--
.../XmlConfigurationProviderAllowedMethodsTest.java | 10 +-
...lConfigurationProviderExceptionMappingsTest.java | 7 ---
.../XmlConfigurationProviderInterceptorsTest.java | 6 ++
.../XmlConfigurationProviderResultsTest.java| 1 +
.../config/providers/xwork-test-allowed-methods.xml | 4 ++--
6 files changed, 32 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3ccd7307/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
index 2181181..cde4c62 100644
---
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
@@ -56,6 +56,7 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
ActionConfig barAction = new ActionConfig.Builder("", "Bar",
SimpleAction.class.getName())
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
.addParams(params).build();
// foo action is a little more complex, two params, a result and an
interceptor stack
@@ -72,6 +73,7 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
.addParams(params)
.addResultConfigs(results)
.addInterceptors(interceptors)
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
.build();
// wildcard action is simple wildcard example
@@ -81,6 +83,7 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
ActionConfig wildcardAction = new ActionConfig.Builder("", "WildCard",
SimpleAction.class.getName())
.addResultConfigs(results)
.addInterceptors(interceptors)
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
.build();
// fooBar action is a little more complex, two params, a result and an
interceptor stack
@@ -99,6 +102,7 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
.addResultConfigs(results)
.addInterceptors(interceptors)
.addExceptionMappings(exceptionMappings)
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
.build();
// TestInterceptorParam action tests that an interceptor worked
@@ -112,6 +116,7 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
ActionConfig intAction = new ActionConfig.Builder("",
"TestInterceptorParam", SimpleAction.class.getName())
.addInterceptors(interceptors)
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
.build();
// TestInterceptorParamOverride action tests that an interceptor with
a param override worked
@@ -123,6 +128,7 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
ActionConfig intOverAction = new ActionConfig.Builder("",
"TestInterceptorParamOverride", SimpleAction.class.getName())
.addInterceptors(interceptors)
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
.build();
// execute the configuration
@@ -164,7 +170,10 @@ public class XmlConfigurationProviderActionsTest extends
ConfigurationTestBase {
params.put("bar", "23");
ActionConfig barWithPackageDefaultClassRefConfig =
-new ActionConfig.Builder("", "Bar",
"").addParams(params).build();
+new ActionConfig.Builder("", "Bar", "")
+.addParams(params)
+.addAllowedMethod(ActionConfig.REGEX_WILDCARD)
+.build();
// execute the configuration
provider.init(configuration);
@@ -188,7 +197,10 @@ public class XmlConfigurationProv
[16/33] struts git commit: Adds annotation to support AllowedMethods
Adds annotation to support AllowedMethods
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ab5fb27d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ab5fb27d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ab5fb27d
Branch: refs/heads/master
Commit: ab5fb27d368f8857e137bc3a319c21fc85b519ee
Parents: dd406fb
Author: Lukasz Lenart
Authored: Thu Sep 3 13:03:55 2015 +0200
Committer: Lukasz Lenart
Committed: Thu Sep 3 13:03:55 2015 +0200
--
.../xwork2/config/entities/PackageConfig.java | 13 -
.../PackageBasedActionConfigBuilder.java| 30 --
.../convention/annotation/AllowedMethods.java | 30 ++
.../PackageBasedActionConfigBuilderTest.java| 60 ++--
.../ClassLevelAllowedMethodsAction.java | 10
.../PackageLevelAllowedMethodsAction.java | 7 +++
.../actions/allowedmethods/package-info.java| 23
.../PackageLevelAllowedMethodsChildAction.java | 9 +++
8 files changed, 171 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ab5fb27d/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index 19ce36f..093985c 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -531,7 +531,18 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
}
public Set getGlobalAllowedMethods() {
-return target.globalAllowedMethods;
+Set allowedMethods = target.globalAllowedMethods;
+allowedMethods.addAll(getParentsAllowedMethods(target.parents));
+return allowedMethods;
+}
+
+public Set getParentsAllowedMethods(List
parents) {
+Set allowedMethods = new HashSet<>();
+for (PackageConfig parent : parents) {
+allowedMethods.addAll(parent.globalAllowedMethods);
+
allowedMethods.addAll(getParentsAllowedMethods(parent.getParents()));
+}
+return allowedMethods;
}
public Builder addGlobalAllowedMethods(Set allowedMethods) {
http://git-wip-us.apache.org/repos/asf/struts/blob/ab5fb27d/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index b4a8be9..64a0e98 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -42,6 +42,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
import org.apache.struts2.convention.annotation.*;
+import org.apache.struts2.convention.annotation.AllowedMethods;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -652,6 +653,8 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
String actionPackage = actionClass.getPackage().getName();
LOG.debug("Processing class [{}] in package [{}]",
actionClass.getName(), actionPackage);
+Set allowedMethods = getAllowedMethods(actionClass);
+
// Determine the default namespace and action name
List namespaces = determineActionNamespace(actionClass);
for (String namespace : namespaces) {
@@ -692,7 +695,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
// Build the default
if (!found) {
-createActionConfig(defaultPackageConfig, actionClass,
defaultActionName, DEFAULT_METHOD, null);
+createActionConfig(defaultPackageConfig, actionClass,
defaultActionName, DEFAULT_METHOD, null, allowedMethods);
}
}
@@ -706,14 +709,14 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
actionClass, action);
}
-createActionConfig(pkgCfg, actionClass,
defaultActionName, method, action);
+
[10/33] struts git commit: Simplifies implementation
Simplifies implementation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/18553046
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/18553046
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/18553046
Branch: refs/heads/master
Commit: 185530464b838b3aac9681b5ff5b16401ccef56d
Parents: 3b31c42
Author: Lukasz Lenart
Authored: Mon Aug 31 18:36:41 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 18:36:41 2015 +0200
--
.../config/providers/XmlConfigurationProvider.java | 16 +++-
core/src/main/resources/struts-2.5.dtd | 3 ---
core/src/main/resources/struts-default.xml | 2 +-
core/src/main/resources/xwork-2.5.dtd | 3 ---
core/src/test/resources/xwork-sample.xml| 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/18553046/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index fd9f92a..0d64ad7 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -893,12 +893,18 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
}
protected void loadGlobalAllowedMethods(PackageConfig.Builder
packageContext, Element packageElement) {
-NodeList globalAllowedMethods =
packageElement.getElementsByTagName("global-allowed-methods");
+NodeList globalAllowedMethodsElms =
packageElement.getElementsByTagName("global-allowed-methods");
-if (globalAllowedMethods.getLength() > 0) {
-Element globalAllowedMethodsElement = (Element)
globalAllowedMethods.item(0);
-Set results =
TextParseUtil.commaDelimitedStringToSet(globalAllowedMethodsElement.getAttribute("methods"));
-packageContext.addGlobalAllowedMethods(results);
+if (globalAllowedMethodsElms.getLength() > 0) {
+Set globalAllowedMethods = new HashSet<>();
+Node n = globalAllowedMethodsElms.item(0).getFirstChild();
+if (n != null) {
+String s = n.getNodeValue().trim();
+if (s.length() > 0) {
+globalAllowedMethods =
TextParseUtil.commaDelimitedStringToSet(s);
+}
+}
+packageContext.addGlobalAllowedMethods(globalAllowedMethods);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/18553046/core/src/main/resources/struts-2.5.dtd
--
diff --git a/core/src/main/resources/struts-2.5.dtd
b/core/src/main/resources/struts-2.5.dtd
index 25ca800..6591ddb 100644
--- a/core/src/main/resources/struts-2.5.dtd
+++ b/core/src/main/resources/struts-2.5.dtd
@@ -90,9 +90,6 @@
-
http://git-wip-us.apache.org/repos/asf/struts/blob/18553046/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 9fc1c21..d7a0ee0 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -358,7 +358,7 @@
-
+
execute,input,back,cancel,browse
http://git-wip-us.apache.org/repos/asf/struts/blob/18553046/core/src/main/resources/xwork-2.5.dtd
--
diff --git a/core/src/main/resources/xwork-2.5.dtd
b/core/src/main/resources/xwork-2.5.dtd
index 4d3e1ca..197d0c1 100644
--- a/core/src/main/resources/xwork-2.5.dtd
+++ b/core/src/main/resources/xwork-2.5.dtd
@@ -69,9 +69,6 @@
-
http://git-wip-us.apache.org/repos/asf/struts/blob/18553046/core/src/test/resources/xwork-sample.xml
--
diff --git a/core/src/test/resources/xwork-sample.xml
b/core/src/test/resources/xwork-sample.xml
index cd2ddcb..7f5e547 100644
--- a/core/src/test/resources/xwork-sample.xml
+++ b/core/src/test/resources/xwork-sample.xml
@@ -14,7 +14,7 @@
-
+
execute,input,back,cancel,browse
17
[08/33] struts git commit: Fixes tests
Fixes tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c1928ad0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c1928ad0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c1928ad0
Branch: refs/heads/master
Commit: c1928ad06bdfbe245b1ed7d5bfeb07ed9bface37
Parents: c3f4457
Author: Lukasz Lenart
Authored: Mon Aug 31 18:36:04 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 18:36:04 2015 +0200
--
.../XmlConfigurationProviderAllowedMethodsTest.java | 14 +++---
.../config/providers/xwork-test-allowed-methods.xml | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c1928ad0/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
index 6a55e75..11f779a 100644
---
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
@@ -27,12 +27,12 @@ public class XmlConfigurationProviderAllowedMethodsTest
extends ConfigurationTes
assertEquals(5, actionConfigs.size());
ActionConfig action = (ActionConfig) actionConfigs.get("Default");
-assertEquals(1, action.getAllowedMethods().size());
+assertEquals(0, action.getAllowedMethods().size());
assertTrue(action.isAllowedMethod("execute"));
-assertTrue(action.isAllowedMethod("foo"));
-assertTrue(action.isAllowedMethod("bar"));
-assertTrue(action.isAllowedMethod("baz"));
-assertTrue(action.isAllowedMethod("xyz"));
+assertFalse(action.isAllowedMethod("foo"));
+assertFalse(action.isAllowedMethod("bar"));
+assertFalse(action.isAllowedMethod("baz"));
+assertFalse(action.isAllowedMethod("xyz"));
action = (ActionConfig) actionConfigs.get("Boring");
assertEquals(0, action.getAllowedMethods().size());
@@ -59,7 +59,7 @@ public class XmlConfigurationProviderAllowedMethodsTest
extends ConfigurationTes
assertFalse(action.isAllowedMethod("xyz"));
action = (ActionConfig) actionConfigs.get("Baz");
-assertEquals(2, action.getAllowedMethods().size());
+assertEquals(3, action.getAllowedMethods().size());
assertFalse(action.isAllowedMethod("execute"));
assertTrue(action.isAllowedMethod("foo"));
assertTrue(action.isAllowedMethod("bar"));
@@ -114,7 +114,7 @@ public class XmlConfigurationProviderAllowedMethodsTest
extends ConfigurationTes
assertFalse(action.isAllowedMethod("xyz"));
action = (ActionConfig) actionConfigs.get("Baz");
-assertEquals(2, action.getAllowedMethods().size());
+assertEquals(3, action.getAllowedMethods().size());
assertFalse(action.isAllowedMethod("execute"));
assertTrue(action.isAllowedMethod("foo"));
assertTrue(action.isAllowedMethod("bar"));
http://git-wip-us.apache.org/repos/asf/struts/blob/c1928ad0/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
--
diff --git
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
index 7851408..4059d62 100644
---
a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
+++
b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml
@@ -25,7 +25,7 @@
-
+
[28/33] struts git commit: Inlines and simplifies
Inlines and simplifies
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d511d282
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d511d282
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d511d282
Branch: refs/heads/master
Commit: d511d282045fa30aee3f994c7fdac78c600cc417
Parents: 2940761
Author: Lukasz Lenart
Authored: Tue Sep 8 08:31:40 2015 +0200
Committer: Lukasz Lenart
Committed: Tue Sep 8 08:31:40 2015 +0200
--
.../xwork2/config/entities/PackageConfig.java | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d511d282/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index 10286c4..e5d3ef4 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -614,19 +614,15 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
}
public PackageConfig build() {
-embalmTarget();
-PackageConfig result = target;
-target = new PackageConfig(result);
-return result;
-}
-
-protected void embalmTarget() {
target.actionConfigs =
Collections.unmodifiableMap(target.actionConfigs);
target.globalResultConfigs =
Collections.unmodifiableMap(target.globalResultConfigs);
target.interceptorConfigs =
Collections.unmodifiableMap(target.interceptorConfigs);
target.resultTypeConfigs =
Collections.unmodifiableMap(target.resultTypeConfigs);
target.globalExceptionMappingConfigs =
Collections.unmodifiableList(target.globalExceptionMappingConfigs);
target.parents = Collections.unmodifiableList(target.parents);
+PackageConfig result = target;
+target = new PackageConfig(result);
+return result;
}
@Override
[29/33] struts git commit: Includes additional global allowed methods
Includes additional global allowed methods Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e3743111 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e3743111 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e3743111 Branch: refs/heads/master Commit: e3743111ffe13eec93232e5e71a56e5ac1fca0a5 Parents: d511d28 Author: Lukasz Lenart Authored: Tue Sep 15 09:02:38 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 15 09:02:38 2015 +0200 -- core/src/main/resources/struts-default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e3743111/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 2dd6b75..b95a1a0 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -362,7 +362,7 @@ - execute,input,back,cancel,browse + execute,input,back,cancel,browse,save,delete,list,index
[21/33] struts git commit: Adds basic test case
Adds basic test case
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7db5e761
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7db5e761
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7db5e761
Branch: refs/heads/master
Commit: 7db5e76133e22e86e0af0687fe1b3f1b80bfc09a
Parents: f1dbc5a
Author: Lukasz Lenart
Authored: Fri Sep 4 09:24:18 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 09:24:18 2015 +0200
--
.../config/entities/AllowedMethodsTest.java | 55
1 file changed, 55 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/7db5e761/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
new file mode 100644
index 000..78f3094
--- /dev/null
+++
b/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
@@ -0,0 +1,55 @@
+package com.opensymphony.xwork2.config.entities;
+
+import junit.framework.TestCase;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class AllowedMethodsTest extends TestCase {
+
+public void testLiteralMethods() throws Exception {
+// given
+String method = "myMethod";
+Set literals = new HashSet<>();
+literals.add(method);
+
+// when
+AllowedMethods allowedMethods = AllowedMethods.build(literals);
+
+// then
+assertEquals(1, allowedMethods.list().size());
+assertTrue(allowedMethods.isAllowed(method));
+assertFalse(allowedMethods.isAllowed("someOtherMethod"));
+}
+
+public void testWidlcardMethods() throws Exception {
+// given
+String method = "my{1}";
+Set literals = new HashSet<>();
+literals.add(method);
+
+// when
+AllowedMethods allowedMethods = AllowedMethods.build(literals);
+
+// then
+assertEquals(1, allowedMethods.list().size());
+assertTrue(allowedMethods.isAllowed("myMethod"));
+assertFalse(allowedMethods.isAllowed("someOtherMethod"));
+}
+
+public void testRegexMethods() throws Exception {
+// given
+String method = "regex:my([a-zA-Z].*)";
+Set literals = new HashSet<>();
+literals.add(method);
+
+// when
+AllowedMethods allowedMethods = AllowedMethods.build(literals);
+
+// then
+assertEquals(1, allowedMethods.list().size());
+assertTrue(allowedMethods.isAllowed("myMethod"));
+assertFalse(allowedMethods.isAllowed("someOtherMethod"));
+}
+
+}
[25/33] struts git commit: Enables Strict DMI by default
Enables Strict DMI by default Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e9e6ae90 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e9e6ae90 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e9e6ae90 Branch: refs/heads/master Commit: e9e6ae90e6d7efc931b1738c55fa052045b7bef5 Parents: 3ccd730 Author: Lukasz Lenart Authored: Fri Sep 4 11:44:44 2015 +0200 Committer: Lukasz Lenart Committed: Fri Sep 4 11:44:44 2015 +0200 -- core/src/main/resources/struts-default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e9e6ae90/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 f1684e5..2dd6b75 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -165,7 +165,7 @@ - +
[22/33] struts git commit: Drops unneeded if clause
Drops unneeded if clause
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/45af8765
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/45af8765
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/45af8765
Branch: refs/heads/master
Commit: 45af87655d1904bc55934512b5f0790dd04afa2d
Parents: 7db5e76
Author: Lukasz Lenart
Authored: Fri Sep 4 11:35:07 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 11:35:07 2015 +0200
--
.../struts2/convention/PackageBasedActionConfigBuilder.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/45af8765/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index 64a0e98..0fc238c 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -921,9 +921,7 @@ public class PackageBasedActionConfigBuilder implements
ActionConfigBuilder {
ActionConfig.Builder actionConfig = new
ActionConfig.Builder(pkgCfg.getName(), actionName, className);
actionConfig.methodName(actionMethod);
-if (!allowedMethods.contains(actionMethod)) {
-actionConfig.addAllowedMethod(actionMethod);
-}
+actionConfig.addAllowedMethod(actionMethod);
actionConfig.addAllowedMethod(allowedMethods);
actionConfig.addAllowedMethod(pkgCfg.getGlobalAllowedMethods());
[33/33] struts git commit: WW-4540 Implements Strict DMI aka SMI
WW-4540 Implements Strict DMI aka SMI Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b8826816 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b8826816 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b8826816 Branch: refs/heads/master Commit: b8826816550422be78be1f7f86ef28f86ee3ca3c Parents: 48ea26b fdb6dae Author: Lukasz Lenart Authored: Mon Sep 28 20:51:50 2015 +0200 Committer: Lukasz Lenart Committed: Mon Sep 28 20:51:50 2015 +0200 -- .../opensymphony/xwork2/DefaultActionProxy.java | 9 +- .../xwork2/DefaultUnknownHandlerManager.java| 1 + .../xwork2/UnknownHandlerManager.java | 1 + .../xwork2/config/entities/ActionConfig.java| 56 +++--- .../xwork2/config/entities/AllowedMethods.java | 172 +++ .../xwork2/config/entities/PackageConfig.java | 136 --- .../xwork2/config/impl/ActionConfigMatcher.java | 2 +- .../providers/XmlConfigurationProvider.java | 85 +++-- .../config/StrutsXmlConfigurationProvider.java | 1 + core/src/main/resources/struts-2.5.dtd | 153 + core/src/main/resources/struts-default.xml | 9 +- core/src/main/resources/xwork-2.5.dtd | 132 ++ .../xwork2/ActionInvocationTest.java| 17 +- .../config/entities/AllowedMethodsTest.java | 55 ++ .../config/entities/PackageConfigTest.java | 62 ++- .../XmlConfigurationProviderActionsTest.java| 8 +- ...ConfigurationProviderAllowedMethodsTest.java | 4 +- ...figurationProviderExceptionMappingsTest.java | 6 +- .../struts2/TestConfigurationProvider.java | 1 + .../providers/xwork-test-allowed-methods.xml| 2 +- core/src/test/resources/xwork-sample.xml| 6 +- .../convention/ConventionUnknownHandler.java| 6 + .../PackageBasedActionConfigBuilder.java| 32 +++- .../convention/annotation/AllowedMethods.java | 30 .../PackageBasedActionConfigBuilderTest.java| 60 ++- .../ClassLevelAllowedMethodsAction.java | 10 ++ .../PackageLevelAllowedMethodsAction.java | 7 + .../actions/allowedmethods/package-info.java| 23 +++ .../PackageLevelAllowedMethodsChildAction.java | 9 + 29 files changed, 944 insertions(+), 151 deletions(-) --
[17/33] struts git commit: Puts back option to disable strict DMI
Puts back option to disable strict DMI
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e4fc8528
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e4fc8528
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e4fc8528
Branch: refs/heads/master
Commit: e4fc8528b874d5d4d454ec8d8976b696a8375f82
Parents: ab5fb27
Author: Lukasz Lenart
Authored: Fri Sep 4 08:55:14 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 08:55:14 2015 +0200
--
.../xwork2/config/entities/PackageConfig.java | 10 ++
.../xwork2/config/providers/XmlConfigurationProvider.java | 3 +++
core/src/main/resources/struts-2.5.dtd| 1 +
core/src/main/resources/xwork-2.5.dtd | 1 +
4 files changed, 15 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e4fc8528/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index 093985c..aa53a12 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -448,6 +448,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
public static class Builder implements InterceptorLocator {
protected PackageConfig target;
+private boolean strictDMI;
public Builder(String name) {
target = new PackageConfig(name);
@@ -613,6 +614,15 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
return target.getAllInterceptorConfigs().get(name);
}
+public Builder strictMethodInvocation(boolean strict) {
+strictDMI = strict;
+return this;
+}
+
+public boolean isStrictMethodInvocation() {
+return strictDMI;
+}
+
public PackageConfig build() {
embalmTarget();
PackageConfig result = target;
http://git-wip-us.apache.org/repos/asf/struts/blob/e4fc8528/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 0302a68..3009dcb 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -649,9 +649,12 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
String name =
StringUtils.defaultString(packageElement.getAttribute("name"));
String namespace =
StringUtils.defaultString(packageElement.getAttribute("namespace"));
+boolean strictDMI =
Boolean.parseBoolean(packageElement.getAttribute("strict-method-invocation"));
+
PackageConfig.Builder cfg = new PackageConfig.Builder(name)
.namespace(namespace)
.isAbstract(isAbstract)
+.strictMethodInvocation(strictDMI)
.location(DomHelper.getLocationObject(packageElement));
if (StringUtils.isNotEmpty(StringUtils.defaultString(parent))) { //
has parents, let's look it up
http://git-wip-us.apache.org/repos/asf/struts/blob/e4fc8528/core/src/main/resources/struts-2.5.dtd
--
diff --git a/core/src/main/resources/struts-2.5.dtd
b/core/src/main/resources/struts-2.5.dtd
index 0845eee..b426d29 100644
--- a/core/src/main/resources/struts-2.5.dtd
+++ b/core/src/main/resources/struts-2.5.dtd
@@ -43,6 +43,7 @@
extends CDATA #IMPLIED
namespace CDATA #IMPLIED
abstract CDATA #IMPLIED
+strict-method-invocation (true|false) "true"
>
http://git-wip-us.apache.org/repos/asf/struts/blob/e4fc8528/core/src/main/resources/xwork-2.5.dtd
--
diff --git a/core/src/main/resources/xwork-2.5.dtd
b/core/src/main/resources/xwork-2.5.dtd
index 197d0c1..31c1167 100644
--- a/core/src/main/resources/xwork-2.5.dtd
+++ b/core/src/main/resources/xwork-2.5.dtd
@@ -22,6 +22,7 @@
extends CDATA #IMPLIED
namespace CDATA #IMPLIED
abstract CDATA #IMPLIED
+strict-method-invocation (true|false) "true"
>
[14/33] struts git commit: Implements required method
Implements required method
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/77691563
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/77691563
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/77691563
Branch: refs/heads/master
Commit: 77691563b9b8d2ad01c078a66d1ed207bf3611b3
Parents: 4c7a7dd
Author: Lukasz Lenart
Authored: Mon Aug 31 21:46:47 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 21:46:47 2015 +0200
--
.../struts2/convention/ConventionUnknownHandler.java | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/77691563/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index 85ce714..78c1956 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -28,6 +28,7 @@ import
com.opensymphony.xwork2.config.providers.InterceptorBuilder;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.TextParseUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -67,6 +68,8 @@ public class ConventionUnknownHandler implements
UnknownHandler {
private ConventionsService conventionsService;
private String nameSeparator;
+protected Set allowedMethods = new HashSet<>();
+
/**
* Constructs the unknown handler.
*
@@ -102,6 +105,8 @@ public class ConventionUnknownHandler implements
UnknownHandler {
}
this.redirectToSlash = Boolean.parseBoolean(redirectToSlash);
+
+allowedMethods =
TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse");
}
public ActionConfig handleUnknownAction(String namespace, String
actionName)
@@ -398,4 +403,9 @@ public class ConventionUnknownHandler implements
UnknownHandler {
this.ext = ext;
}
}
+
+@Override
+public boolean isAllowedMethod(String allowedMethod, ActionConfig
actionConfig) {
+return false;
+}
}
[18/33] struts git commit: Adds support to define allowed methods as regex
Adds support to define allowed methods as regex
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e38d4657
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e38d4657
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e38d4657
Branch: refs/heads/master
Commit: e38d4657c6a973b30b9ece360f7ea2c97fb69555
Parents: e4fc852
Author: Lukasz Lenart
Authored: Fri Sep 4 09:04:37 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 09:04:37 2015 +0200
--
.../xwork2/config/entities/ActionConfig.java| 1 +
.../xwork2/config/entities/AllowedMethods.java | 5 +++-
.../providers/XmlConfigurationProvider.java | 24
3 files changed, 20 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e38d4657/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index 5303e83..7c10c90 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -43,6 +43,7 @@ public class ActionConfig extends Located implements
Serializable {
public static final String DEFAULT_METHOD = "execute";
public static final String WILDCARD = "*";
+public static final String REGEX_WILDCARD = "regex:.*";
protected List interceptors; // a list of
interceptorMapping Objects eg. List
protected Map params;
http://git-wip-us.apache.org/repos/asf/struts/blob/e38d4657/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
index 7a4fec1..f619d89 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
@@ -32,8 +32,11 @@ public class AllowedMethods {
ret.append(c);
}
}
-if (isPattern) {
+if (isPattern && !method.startsWith("regex:")) {
return new PatternAllowedMethod(ret.toString(), method);
+} else if (method.startsWith("regex:")) {
+String pattern = method.substring(method.indexOf(":") + 1);
+return new PatternAllowedMethod(pattern, method);
} else {
return new LiteralAllowedMethod(ret.toString());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e38d4657/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 3009dcb..950d4a1 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -845,17 +845,23 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
protected Set buildAllowedMethods(Element element,
PackageConfig.Builder packageContext) {
NodeList allowedMethodsEls =
element.getElementsByTagName("allowed-methods");
-Set allowedMethods = packageContext.getGlobalAllowedMethods();
-
-if (allowedMethodsEls.getLength() > 0) {
-allowedMethods = new HashSet<>();
-Node n = allowedMethodsEls.item(0).getFirstChild();
-if (n != null) {
-String s = n.getNodeValue().trim();
-if (s.length() > 0) {
-allowedMethods =
TextParseUtil.commaDelimitedStringToSet(s);
+Set allowedMethods;
+if (packageContext.isStrictMethodInvocation()) {
+allowedMethods = packageContext.getGlobalAllowedMethods();
+
+if (allowedMethodsEls.getLength() > 0) {
+allowedMethods = new HashSet<>();
+Node n = allowedMethodsEls.item(0).getFirstChild();
+if (n != null) {
+String s = n.getNodeValue().trim();
+if (s.length() > 0) {
+allowedMethods =
TextParseUtil.commaDelimitedStringToSet(s);
+}
}
}
+} else {
+
[32/33] struts git commit: Simplifies checking of Strict DMI to simple getter
Simplifies checking of Strict DMI to simple getter
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fdb6daec
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fdb6daec
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fdb6daec
Branch: refs/heads/master
Commit: fdb6daec7859e0cf95a0da5482991b8342cf91ad
Parents: 86afcbe
Author: Lukasz Lenart
Authored: Sat Sep 26 08:57:44 2015 +0200
Committer: Lukasz Lenart
Committed: Sat Sep 26 08:57:44 2015 +0200
--
.../xwork2/config/entities/PackageConfig.java | 14 +
.../config/entities/PackageConfigTest.java | 62 +++-
2 files changed, 62 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fdb6daec/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index e297b49..1e7a4dd 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -600,22 +600,12 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
}
public Builder strictMethodInvocation(boolean strict) {
-strictDMI = strict;
+target.strictMethodInvocation = strict;
return this;
}
public boolean isStrictMethodInvocation() {
-// if Strict DMI was disabled in this package,
-// return without evaluating parent packages
-if (!strictDMI) {
-return false;
-}
-for (PackageConfig parent : target.parents) {
-if (parent.isStrictMethodInvocation()) {
-return true;
-}
-}
-return true;
+return target.strictMethodInvocation;
}
public PackageConfig build() {
http://git-wip-us.apache.org/repos/asf/struts/blob/fdb6daec/core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
index e2f2868..4a25ccb 100644
---
a/core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
@@ -30,5 +30,63 @@ public class PackageConfigTest extends XWorkTestCase {
assertEquals("ref2", cfg.getFullDefaultInterceptorRef());
}
-
-}
\ No newline at end of file
+
+public void testStrictDMIInheritance() {
+// given
+PackageConfig parent = new PackageConfig.Builder("parent").build();
+
+// when
+PackageConfig child = new PackageConfig.Builder("child")
+.addParent(parent)
+.build();
+
+// then
+assertTrue(child.isStrictMethodInvocation());
+}
+
+public void testStrictDMIInheritanceDisabledInParentPackage() {
+// given
+PackageConfig parent = new PackageConfig.Builder("parent")
+.strictMethodInvocation(false)
+.build();
+
+// when
+PackageConfig child = new PackageConfig.Builder("child")
+.addParent(parent)
+.build();
+
+// then
+assertTrue(child.isStrictMethodInvocation());
+}
+
+public void testStrictDMIInheritanceDisabledInBothPackage() {
+// given
+PackageConfig parent = new PackageConfig.Builder("parent")
+.strictMethodInvocation(false)
+.build();
+
+// when
+PackageConfig child = new PackageConfig.Builder("child")
+.addParent(parent)
+.strictMethodInvocation(false)
+.build();
+
+// then
+assertFalse(child.isStrictMethodInvocation());
+}
+
+public void testStrictDMIInheritanceDisabledInChildPackage() {
+// given
+PackageConfig parent = new PackageConfig.Builder("parent").build();
+
+// when
+PackageConfig child = new PackageConfig.Builder("child")
+.addParent(parent)
+.strictMethodInvocation(false)
+.build();
+
+// then
+assertFalse(child.isStrictMethodInvocation());
+}
+
+}
[23/33] struts git commit: Adds more strict DMI logic
Adds more strict DMI logic
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0aaade64
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0aaade64
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0aaade64
Branch: refs/heads/master
Commit: 0aaade64cd332a7a5f45ae5068b8f7be1abb3817
Parents: 45af876
Author: Lukasz Lenart
Authored: Fri Sep 4 11:35:23 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 11:35:23 2015 +0200
--
.../xwork2/config/providers/XmlConfigurationProvider.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/0aaade64/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 950d4a1..7d2e065 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -846,7 +846,8 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
NodeList allowedMethodsEls =
element.getElementsByTagName("allowed-methods");
Set allowedMethods;
-if (packageContext.isStrictMethodInvocation()) {
+if (allowedMethodsEls.getLength() > 0) {
+// user defined 'allowed-methods' so used them whatever Strict DMI
was enabled or not
allowedMethods = packageContext.getGlobalAllowedMethods();
if (allowedMethodsEls.getLength() > 0) {
@@ -859,7 +860,11 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
}
}
}
+} else if (packageContext.isStrictMethodInvocation()) {
+// user enabled Strict DMI but didn't defined action specific
'allowed-methods' so we use 'global-allowed-methods' only
+allowedMethods = packageContext.getGlobalAllowedMethods();
} else {
+// Strict DMI is disabled to any method can be called
allowedMethods = new HashSet<>();
allowedMethods.add(ActionConfig.REGEX_WILDCARD);
}
[31/33] struts git commit: Switches Strict DMI to true by default and allows to be disabled in user's package
Switches Strict DMI to true by default and allows to be disabled in user's
package
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/86afcbe6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/86afcbe6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/86afcbe6
Branch: refs/heads/master
Commit: 86afcbe611f7c3afda26e396cc4504d3c9998398
Parents: b838105
Author: Lukasz Lenart
Authored: Fri Sep 25 10:42:43 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 25 10:42:43 2015 +0200
--
.../opensymphony/xwork2/config/entities/PackageConfig.java | 9 +++--
.../xwork2/config/providers/XmlConfigurationProvider.java | 6 +-
.../providers/XmlConfigurationProviderActionsTest.java | 8
.../XmlConfigurationProviderExceptionMappingsTest.java | 1 -
.../providers/XmlConfigurationProviderInterceptorsTest.java | 4
.../providers/XmlConfigurationProviderResultsTest.java | 1 -
6 files changed, 12 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/86afcbe6/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index e5d3ef4..e297b49 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -433,7 +433,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
public static class Builder implements InterceptorLocator {
protected PackageConfig target;
-private boolean strictDMI;
+private boolean strictDMI = true;
public Builder(String name) {
target = new PackageConfig(name);
@@ -605,12 +605,17 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
}
public boolean isStrictMethodInvocation() {
+// if Strict DMI was disabled in this package,
+// return without evaluating parent packages
+if (!strictDMI) {
+return false;
+}
for (PackageConfig parent : target.parents) {
if (parent.isStrictMethodInvocation()) {
return true;
}
}
-return strictDMI;
+return true;
}
public PackageConfig build() {
http://git-wip-us.apache.org/repos/asf/struts/blob/86afcbe6/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 7d2e065..35e2019 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -649,7 +649,11 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
String name =
StringUtils.defaultString(packageElement.getAttribute("name"));
String namespace =
StringUtils.defaultString(packageElement.getAttribute("namespace"));
-boolean strictDMI =
Boolean.parseBoolean(packageElement.getAttribute("strict-method-invocation"));
+// Strict DMI is enabled by default, it can disabled by user
+boolean strictDMI = true;
+if (packageElement.hasAttribute("strict-method-invocation")) {
+strictDMI =
Boolean.parseBoolean(packageElement.getAttribute("strict-method-invocation"));
+}
PackageConfig.Builder cfg = new PackageConfig.Builder(name)
.namespace(namespace)
http://git-wip-us.apache.org/repos/asf/struts/blob/86afcbe6/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
index cde4c62..bd23376 100644
---
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
@@ -56,7 +56,6 @@ public class XmlConfigurationPr
[19/33] struts git commit: Uses factory method pattern
Uses factory method pattern
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cb06d7d2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cb06d7d2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cb06d7d2
Branch: refs/heads/master
Commit: cb06d7d2580e37ab8aba2170c433c1674932c4de
Parents: e38d465
Author: Lukasz Lenart
Authored: Fri Sep 4 09:08:32 2015 +0200
Committer: Lukasz Lenart
Committed: Fri Sep 4 09:08:32 2015 +0200
--
.../xwork2/config/entities/ActionConfig.java| 6 +--
.../xwork2/config/entities/AllowedMethods.java | 54 ++--
2 files changed, 31 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/cb06d7d2/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index 7c10c90..a821c93 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -63,7 +63,7 @@ public class ActionConfig extends Located implements
Serializable {
results = new LinkedHashMap<>();
interceptors = new ArrayList<>();
exceptionMappings = new ArrayList<>();
-allowedMethods = new AllowedMethods(new
HashSet<>(Collections.singletonList(DEFAULT_METHOD)));
+allowedMethods = AllowedMethods.build(new
HashSet<>(Collections.singletonList(DEFAULT_METHOD)));
}
/**
@@ -80,7 +80,7 @@ public class ActionConfig extends Located implements
Serializable {
this.interceptors = new ArrayList<>(orig.interceptors);
this.results = new LinkedHashMap<>(orig.results);
this.exceptionMappings = new ArrayList<>(orig.exceptionMappings);
-this.allowedMethods = new AllowedMethods(orig.allowedMethods.list());
+this.allowedMethods = AllowedMethods.build(orig.allowedMethods.list());
this.location = orig.location;
}
@@ -332,7 +332,7 @@ public class ActionConfig extends Located implements
Serializable {
target.results = Collections.unmodifiableMap(target.results);
target.interceptors =
Collections.unmodifiableList(target.interceptors);
target.exceptionMappings =
Collections.unmodifiableList(target.exceptionMappings);
-target.allowedMethods = new AllowedMethods(allowedMethods);
+target.allowedMethods = AllowedMethods.build(allowedMethods);
ActionConfig result = target;
target = new ActionConfig(target);
http://git-wip-us.apache.org/repos/asf/struts/blob/cb06d7d2/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
index f619d89..7582696 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
@@ -9,37 +9,39 @@ public class AllowedMethods {
private Set allowedMethods;
-public AllowedMethods(Set methods) {
+public static AllowedMethods build(Set methods) {
+
Set allowedMethods = new HashSet<>();
for (String method : methods) {
-allowedMethods.add(build(method));
-}
-this.allowedMethods = Collections.unmodifiableSet(allowedMethods);
-}
-
-private AllowedMethod build(String method) {
-boolean isPattern = false;
-int len = method.length();
-StringBuilder ret = new StringBuilder();
-char c;
-for (int x = 0; x < len; x++) {
-c = method.charAt(x);
-if (x < len - 2 && c == '{' && '}' == method.charAt(x + 2)) {
-ret.append("(.*)");
-isPattern = true;
-x += 2;
+boolean isPattern = false;
+int len = method.length();
+StringBuilder ret = new StringBuilder();
+char c;
+for (int x = 0; x < len; x++) {
+c = method.charAt(x);
+if (x < len - 2 && c == '{' && '}' == method.charAt(x + 2)) {
+ret.append("(.*)");
+isPattern = true;
+x += 2;
+} else {
+ret.append(c);
+}
+}
+if (isPattern && !method.startsWith("regex:")) {
+
[09/33] struts git commit: Adds support for wildcards
Adds support for wildcards
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3b31c428
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3b31c428
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3b31c428
Branch: refs/heads/master
Commit: 3b31c428856766389ad6df4ba1edc3d60ecf5e24
Parents: c1928ad
Author: Lukasz Lenart
Authored: Mon Aug 31 18:36:29 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 18:36:29 2015 +0200
--
.../xwork2/config/entities/ActionConfig.java| 22 +--
.../xwork2/config/entities/AllowedMethods.java | 152 +++
2 files changed, 165 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3b31c428/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index fd61ad9..5303e83 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -52,7 +52,7 @@ public class ActionConfig extends Located implements
Serializable {
protected String methodName;
protected String packageName;
protected String name;
-protected Set allowedMethods;
+protected AllowedMethods allowedMethods;
protected ActionConfig(String packageName, String name, String className) {
this.packageName = packageName;
@@ -62,7 +62,7 @@ public class ActionConfig extends Located implements
Serializable {
results = new LinkedHashMap<>();
interceptors = new ArrayList<>();
exceptionMappings = new ArrayList<>();
-allowedMethods = new
HashSet<>(Collections.singletonList(DEFAULT_METHOD));
+allowedMethods = new AllowedMethods(new
HashSet<>(Collections.singletonList(DEFAULT_METHOD)));
}
/**
@@ -79,7 +79,7 @@ public class ActionConfig extends Located implements
Serializable {
this.interceptors = new ArrayList<>(orig.interceptors);
this.results = new LinkedHashMap<>(orig.results);
this.exceptionMappings = new ArrayList<>(orig.exceptionMappings);
-this.allowedMethods = new HashSet<>(orig.allowedMethods);
+this.allowedMethods = new AllowedMethods(orig.allowedMethods.list());
this.location = orig.location;
}
@@ -100,7 +100,7 @@ public class ActionConfig extends Located implements
Serializable {
}
public Set getAllowedMethods() {
-return allowedMethods;
+return allowedMethods.list();
}
/**
@@ -128,7 +128,7 @@ public class ActionConfig extends Located implements
Serializable {
}
public boolean isAllowedMethod(String method) {
-return method.equals(methodName != null ? methodName : DEFAULT_METHOD)
|| allowedMethods.contains(method);
+return method.equals(methodName != null ? methodName : DEFAULT_METHOD)
|| allowedMethods.isAllowed(method);
}
@Override public boolean equals(Object o) {
@@ -210,14 +210,16 @@ public class ActionConfig extends Located implements
Serializable {
public static class Builder implements InterceptorListHolder{
protected ActionConfig target;
+protected Set allowedMethods;
public Builder(ActionConfig toClone) {
target = new ActionConfig(toClone);
-addAllowedMethod(toClone.getAllowedMethods());
+allowedMethods = toClone.getAllowedMethods();
}
public Builder(String packageName, String name, String className) {
target = new ActionConfig(packageName, name, className);
+allowedMethods = new HashSet<>();
}
public Builder packageName(String name) {
@@ -308,12 +310,14 @@ public class ActionConfig extends Located implements
Serializable {
}
public Builder addAllowedMethod(String methodName) {
-target.allowedMethods.add(methodName);
+if (methodName != null) {
+allowedMethods.add(methodName);
+}
return this;
}
public Builder addAllowedMethod(Collection methods) {
-target.allowedMethods.addAll(methods);
+allowedMethods.addAll(methods);
return this;
}
@@ -327,7 +331,7 @@ public class ActionConfig extends Located implements
Serializable {
target.results = Collections.unmodifiableMap(target.results);
target.interceptors =
Collections.unmodifiableList(target.interceptors);
target.exceptionMappings =
Collections.unmodifiableList(
[27/33] struts git commit: Inherits parents' strict DMI
Inherits parents' strict DMI
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/29407614
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/29407614
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/29407614
Branch: refs/heads/master
Commit: 294076145f153e291eb7c38bb58a9b04bf3fb0e5
Parents: a61a369
Author: Lukasz Lenart
Authored: Tue Sep 8 08:24:28 2015 +0200
Committer: Lukasz Lenart
Committed: Tue Sep 8 08:24:28 2015 +0200
--
.../xwork2/config/entities/PackageConfig.java | 102 +--
...mlConfigurationProviderInterceptorsTest.java | 2 -
2 files changed, 46 insertions(+), 58 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/29407614/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index aa53a12..10286c4 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -53,6 +53,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
protected String namespace = "";
protected boolean isAbstract = false;
protected boolean needsRefresh;
+protected boolean strictMethodInvocation = true;
protected PackageConfig(String name) {
this.name = name;
@@ -82,6 +83,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
this.globalExceptionMappingConfigs = new
ArrayList<>(orig.globalExceptionMappingConfigs);
this.parents = new ArrayList<>(orig.parents);
this.location = orig.location;
+this.strictMethodInvocation = orig.strictMethodInvocation;
}
public boolean isAbstract() {
@@ -330,7 +332,6 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
return resultTypeConfigs;
}
-
public boolean isNeedsRefresh() {
return needsRefresh;
}
@@ -345,80 +346,64 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
return globalExceptionMappingConfigs;
}
+public boolean isStrictMethodInvocation() {
+return strictMethodInvocation;
+}
+
@Override
public boolean equals(Object o) {
-if (this == o) {
-return true;
-}
-
-if (!(o instanceof PackageConfig)) {
-return false;
-}
-
-final PackageConfig packageConfig = (PackageConfig) o;
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
-if (isAbstract != packageConfig.isAbstract) {
-return false;
-}
+PackageConfig that = (PackageConfig) o;
-if ((actionConfigs != null) ?
(!actionConfigs.equals(packageConfig.actionConfigs)) :
(packageConfig.actionConfigs != null)) {
+if (isAbstract != that.isAbstract) return false;
+if (needsRefresh != that.needsRefresh) return false;
+if (strictMethodInvocation != that.strictMethodInvocation) return
false;
+if (actionConfigs != null ? !actionConfigs.equals(that.actionConfigs)
: that.actionConfigs != null)
return false;
-}
-
-if ((defaultResultType != null) ?
(!defaultResultType.equals(packageConfig.defaultResultType)) :
(packageConfig.defaultResultType != null)) {
+if (globalResultConfigs != null ?
!globalResultConfigs.equals(that.globalResultConfigs) :
that.globalResultConfigs != null)
return false;
-}
-
-if ((defaultClassRef != null) ?
(!defaultClassRef.equals(packageConfig.defaultClassRef)) :
(packageConfig.defaultClassRef != null)) {
+if (globalAllowedMethods != null ?
!globalAllowedMethods.equals(that.globalAllowedMethods) :
that.globalAllowedMethods != null)
return false;
-}
-
-if ((globalResultConfigs != null) ?
(!globalResultConfigs.equals(packageConfig.globalResultConfigs)) :
(packageConfig.globalResultConfigs != null)) {
+if (interceptorConfigs != null ?
!interceptorConfigs.equals(that.interceptorConfigs) : that.interceptorConfigs
!= null)
return false;
-}
-
-if ((interceptorConfigs != null) ?
(!interceptorConfigs.equals(packageConfig.interceptorConfigs)) :
(packageConfig.interceptorConfigs != null)) {
+if (resultTypeConfigs != null ?
!resultTypeConfigs.equals(that.resultTypeConfigs) : that.resultTypeConfigs !=
null)
return false;
-}
-
-if ((name != nu
[02/33] struts git commit: Defines global-allowed-methods
Defines global-allowed-methods
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ce884e92
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ce884e92
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ce884e92
Branch: refs/heads/master
Commit: ce884e92a15ef601b0e119963d3c521fa68d8bb1
Parents: 065b5b7
Author: Lukasz Lenart
Authored: Mon Aug 31 14:33:31 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 14:33:31 2015 +0200
--
.../xwork2/config/entities/ActionConfig.java| 1 +
.../providers/XmlConfigurationProvider.java | 48 --
.../config/StrutsXmlConfigurationProvider.java | 1 +
core/src/main/resources/struts-2.5.dtd | 156 +++
core/src/main/resources/struts-default.xml | 6 +-
core/src/main/resources/xwork-2.5.dtd | 135
6 files changed, 336 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ce884e92/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index b947ed9..fd61ad9 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -42,6 +42,7 @@ import java.util.*;
public class ActionConfig extends Located implements Serializable {
public static final String DEFAULT_METHOD = "execute";
+public static final String WILDCARD = "*";
protected List interceptors; // a list of
interceptorMapping Objects eg. List
protected Map params;
http://git-wip-us.apache.org/repos/asf/struts/blob/ce884e92/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 12a71c7..449d254 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -15,12 +15,24 @@
*/
package com.opensymphony.xwork2.config.providers;
-import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.FileManager;
+import com.opensymphony.xwork2.FileManagerFactory;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.XWorkException;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.config.ConfigurationUtil;
-import com.opensymphony.xwork2.config.entities.*;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorConfig;
+import com.opensymphony.xwork2.config.entities.InterceptorMapping;
+import com.opensymphony.xwork2.config.entities.InterceptorStackConfig;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
+import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig;
import com.opensymphony.xwork2.config.impl.LocatableFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.ContainerBuilder;
@@ -47,7 +59,17 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Modifier;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
/**
@@ -90,6 +112,7 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
this.errorIfMissing = errorIfMissing;
Map mappings = new HashMap<>();
+mappings.put("-//Apache Struts//XWork 2.5//EN", "xwork-2.5.dtd");
mappings.put("-//Apache Struts//XWork 2.3//EN", "xwork-2.3.dtd");
mappings.put("-//Apache Struts//XWork 2.1.3//EN", "xwork-2.1.3.dtd");
mappings.put("-//Apache Struts//XWork 2.1//EN", "xwork-2.1.
[03/33] struts git commit: Uses global-allowed-methods config para
Uses global-allowed-methods config para
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fd22e3a1
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fd22e3a1
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fd22e3a1
Branch: refs/heads/master
Commit: fd22e3a16c88ef0528c1e26e0d6bdfdf1c02c755
Parents: ce884e9
Author: Lukasz Lenart
Authored: Mon Aug 31 14:35:16 2015 +0200
Committer: Lukasz Lenart
Committed: Mon Aug 31 14:35:16 2015 +0200
--
.../xwork2/config/entities/PackageConfig.java | 22 +++-
1 file changed, 12 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/fd22e3a1/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index c9ef12d..19ce36f 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -40,6 +40,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
protected Map actionConfigs;
protected Map globalResultConfigs;
+protected Set globalAllowedMethods;
protected Map interceptorConfigs;
protected Map resultTypeConfigs;
protected List globalExceptionMappingConfigs;
@@ -57,6 +58,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
this.name = name;
actionConfigs = new LinkedHashMap<>();
globalResultConfigs = new LinkedHashMap<>();
+globalAllowedMethods = new HashSet<>();
interceptorConfigs = new LinkedHashMap<>();
resultTypeConfigs = new LinkedHashMap<>();
globalExceptionMappingConfigs = new ArrayList<>();
@@ -74,6 +76,7 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
this.needsRefresh = orig.needsRefresh;
this.actionConfigs = new LinkedHashMap<>(orig.actionConfigs);
this.globalResultConfigs = new
LinkedHashMap<>(orig.globalResultConfigs);
+this.globalAllowedMethods = new
LinkedHashSet<>(orig.globalAllowedMethods);
this.interceptorConfigs = new LinkedHashMap<>(orig.interceptorConfigs);
this.resultTypeConfigs = new LinkedHashMap<>(orig.resultTypeConfigs);
this.globalExceptionMappingConfigs = new
ArrayList<>(orig.globalExceptionMappingConfigs);
@@ -445,7 +448,6 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
public static class Builder implements InterceptorLocator {
protected PackageConfig target;
-private boolean strictDMI;
public Builder(String name) {
target = new PackageConfig(name);
@@ -528,6 +530,15 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
return this;
}
+public Set getGlobalAllowedMethods() {
+return target.globalAllowedMethods;
+}
+
+public Builder addGlobalAllowedMethods(Set allowedMethods) {
+target.globalAllowedMethods.addAll(allowedMethods);
+return this;
+}
+
public Builder addExceptionMappingConfig(ExceptionMappingConfig
exceptionMappingConfig) {
target.globalExceptionMappingConfigs.add(exceptionMappingConfig);
return this;
@@ -591,15 +602,6 @@ public class PackageConfig extends Located implements
Comparable, Serializable,
return target.getAllInterceptorConfigs().get(name);
}
-public Builder strictMethodInvocation(boolean strict) {
-strictDMI = strict;
-return this;
-}
-
-public boolean isStrictMethodInvocation() {
-return strictDMI;
-}
-
public PackageConfig build() {
embalmTarget();
PackageConfig result = target;
[04/33] struts git commit: Drops strict DMI
Drops strict DMI Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/55b80700 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/55b80700 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/55b80700 Branch: refs/heads/master Commit: 55b8070048cbec0a6e08b1781f81b1bfdb3354f2 Parents: fd22e3a Author: Lukasz Lenart Authored: Mon Aug 31 14:41:57 2015 +0200 Committer: Lukasz Lenart Committed: Mon Aug 31 14:41:57 2015 +0200 -- core/src/main/resources/xwork-2.5.dtd | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/55b80700/core/src/main/resources/xwork-2.5.dtd -- diff --git a/core/src/main/resources/xwork-2.5.dtd b/core/src/main/resources/xwork-2.5.dtd index efbd765..4d3e1ca 100644 --- a/core/src/main/resources/xwork-2.5.dtd +++ b/core/src/main/resources/xwork-2.5.dtd @@ -22,7 +22,6 @@ extends CDATA #IMPLIED namespace CDATA #IMPLIED abstract CDATA #IMPLIED -strict-method-invocation CDATA #IMPLIED >
struts git commit: [maven-release-plugin] prepare release STRUTS_2_5_BETA2
Repository: struts Updated Branches: refs/heads/master b88268165 -> 56ae397d7 [maven-release-plugin] prepare release STRUTS_2_5_BETA2 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/56ae397d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/56ae397d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/56ae397d Branch: refs/heads/master Commit: 56ae397d75430dc63fd68b0bfb36afbac1226023 Parents: b882681 Author: Lukasz Lenart Authored: Mon Sep 28 21:15:38 2015 +0200 Committer: Lukasz Lenart Committed: Mon Sep 28 21:15:38 2015 +0200 -- 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 +- bom/pom.xml | 8 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/java8-support/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/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| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- 46 files changed, 53 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/56ae397d/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index 87de124..74ad5d8 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.5-SNAPSHOT +2.5-BETA2 struts2-apps pom http://git-wip-us.apache.org/repos/asf/struts/blob/56ae397d/apps/portlet/pom.xml -- diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 12ddb68..8bc1209 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.5-SNAPSHOT +2.5-BETA2 struts2-portlet http://git-wip-us.apache.org/repos/asf/struts/blob/56ae397d/apps/rest-showcase/pom.xml -- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b02923c..3c230f2 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps -2.5-SNAPSHOT +2.5-BETA2 struts2-rest-showcase war -2.5-SNAPSHOT +2.5-BETA2 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/56ae397d/apps/showcase/pom.xml -- diff
Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_5_BETA2 [created] 6194a3156
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/master 56ae397d7 -> 6fbdab184 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6fbdab18 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6fbdab18 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6fbdab18 Branch: refs/heads/master Commit: 6fbdab1848821b54f3d84981fcd1507f5abd5d92 Parents: 56ae397 Author: Lukasz Lenart Authored: Mon Sep 28 21:15:50 2015 +0200 Committer: Lukasz Lenart Committed: Mon Sep 28 21:15:50 2015 +0200 -- 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 +- bom/pom.xml | 8 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/java8-support/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/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| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- 46 files changed, 49 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/6fbdab18/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index 74ad5d8..87de124 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.5-BETA2 +2.5-SNAPSHOT struts2-apps pom http://git-wip-us.apache.org/repos/asf/struts/blob/6fbdab18/apps/portlet/pom.xml -- diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 8bc1209..12ddb68 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.5-BETA2 +2.5-SNAPSHOT struts2-portlet http://git-wip-us.apache.org/repos/asf/struts/blob/6fbdab18/apps/rest-showcase/pom.xml -- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 3c230f2..b02923c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps -2.5-BETA2 +2.5-SNAPSHOT struts2-rest-showcase war -2.5-BETA2 +2.5-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/6fbdab18/apps/showcase/pom.xml --
svn commit: r10679 - /dev/struts/2.5-BETA2/
Author: lukaszlenart Date: Mon Sep 28 20:52:17 2015 New Revision: 10679 Log: Updates test release 2.5-BETA2 Added: dev/struts/2.5-BETA2/ dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.asc (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.md5 dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.sha1 dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.asc (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.md5 dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.sha1 dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip.asc (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip.md5 dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip.sha1 dev/struts/2.5-BETA2/struts-2.5-BETA2-lib.zip (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-lib.zip.asc (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-lib.zip.md5 dev/struts/2.5-BETA2/struts-2.5-BETA2-lib.zip.sha1 dev/struts/2.5-BETA2/struts-2.5-BETA2-src.zip (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-src.zip.asc (with props) dev/struts/2.5-BETA2/struts-2.5-BETA2-src.zip.md5 dev/struts/2.5-BETA2/struts-2.5-BETA2-src.zip.sha1 Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip == Binary file - no diff available. Propchange: dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.md5 == --- dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.md5 (added) +++ dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.md5 Mon Sep 28 20:52:17 2015 @@ -0,0 +1 @@ +8586381b3b3227b63d5cf09f9c74f032 \ No newline at end of file Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.sha1 == --- dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.sha1 (added) +++ dev/struts/2.5-BETA2/struts-2.5-BETA2-all.zip.sha1 Mon Sep 28 20:52:17 2015 @@ -0,0 +1 @@ +3d69404a92df859c1a4274d3f16b2025f340553b \ No newline at end of file Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.md5 == --- dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.md5 (added) +++ dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.md5 Mon Sep 28 20:52:17 2015 @@ -0,0 +1 @@ +5b23d212622c09c94eeb381336bba4e9 \ No newline at end of file Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.sha1 == --- dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.sha1 (added) +++ dev/struts/2.5-BETA2/struts-2.5-BETA2-apps.zip.sha1 Mon Sep 28 20:52:17 2015 @@ -0,0 +1 @@ +180f041cc128b9bb717bec72a6e531887cff2aaf \ No newline at end of file Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5-BETA2/struts-2.5-BETA2-docs.zip.md5
[4/4] struts-annotations git commit: Uses annotation processor instead of apt
Uses annotation processor instead of apt
Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo
Commit:
http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/1457e57f
Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/1457e57f
Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/1457e57f
Branch: refs/heads/master
Commit: 1457e57f577552e6607c6960bc520cc8aefb056f
Parents: 1287af3
Author: Lukasz Lenart
Authored: Tue Sep 29 08:27:15 2015 +0200
Committer: Lukasz Lenart
Committed: Tue Sep 29 08:27:15 2015 +0200
--
.../apt/TLDAnnotationProcessorFactory.java | 76 -
.../struts/annotations/taglib/apt/Tag.java | 4 +-
.../taglib/apt/TagAnnotationProcessor.java | 292 +++
.../javax.annotation.processing.Processor | 1 +
4 files changed, 108 insertions(+), 265 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/1457e57f/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
--
diff --git
a/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
b/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
deleted file mode 100644
index 663d6ed..000
---
a/src/main/java/org/apache/struts/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * $Id: $
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.struts.annotations.taglib.apt;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessors;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-public class TLDAnnotationProcessorFactory implements
-AnnotationProcessorFactory {
-
-/**
- * Returns a TLD annotation processor.
- *
- * @return An annotation processor for note annotations if requested,
- * otherwise, returns the NO_OP annotation processor.
- */
-public AnnotationProcessor getProcessorFor(
-Set declarations,
-AnnotationProcessorEnvironment env) {
-AnnotationProcessor result;
-if (declarations.isEmpty()) {
-result = AnnotationProcessors.NO_OP;
-} else {
-result = new TagAnnotationProcessor(env);
-}
-return result;
-}
-
-/**
- * This factory builds a processor for Tag and TagAttribute
- *
- * @return a collection containing StutsTag and StrutsTagAttribute
- */
-public Collection supportedAnnotationTypes() {
-return Arrays.asList(TagAnnotationProcessor.TAG,
-TagAnnotationProcessor.TAG_ATTRIBUTE,
-TagAnnotationProcessor.TAG_SKIP_HIERARCHY);
-}
-
-/**
- * Options used to generate the TLD
- *
- * @return an empty list.
- */
-public Collection supportedOptions() {
-return Arrays.asList("-AoutFile", "-AtlibVersion", "-AjspVersion",
-"-AshortName", "-Auri", "-Adescription", "-AdisplayName",
-"-outTemplatesDir");
-}
-}
http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/1457e57f/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
--
diff --git a/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
b/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
index 175bd46..6993830 100644
--- a/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
+++ b/src/main/java/org/apache/struts/annotations/taglib/apt/Tag.java
@@ -34,8 +34,8 @@ public class Tag {
private boolean allowDynamicAttributes;
private boolean include = true;
private String declaredType;
-private
[3/4] struts-annotations git commit: Upgrades pom and dependencies
Upgrades pom and dependencies
Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo
Commit:
http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/1287af3f
Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/1287af3f
Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/1287af3f
Branch: refs/heads/master
Commit: 1287af3fb131357a0f1bd4ec3d27d19f8bb1264f
Parents: 753c441
Author: Lukasz Lenart
Authored: Tue Sep 29 08:26:47 2015 +0200
Committer: Lukasz Lenart
Committed: Tue Sep 29 08:26:47 2015 +0200
--
pom.xml | 78 ++--
1 file changed, 7 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/1287af3f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 07327b0..5c4c424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,17 @@
org.apache.struts
struts-master
-4
+9
4.0.0
-org.apache.struts
struts-annotations
1.0.6-SNAPSHOT
jar
Struts Annotations
http://struts.apache.org
-struts-annotations adds apt generation support for struts based
annotated projetcs,
+struts-annotations adds apt generation support for struts based
annotated projects,
such as TLD and documentation generation from annotated component
classes as used in struts2
@@ -30,9 +29,11 @@
org.apache.maven.plugins
maven-compiler-plugin
+3.3
-1.5
-1.5
+1.7
+1.7
+-proc:none
@@ -57,80 +58,15 @@
com.sun
tools
-1.5.0
+1.7.0
system
${java.home}/../lib/tools.jar
-
-release
-
-
-release
-
-
-
-
-
-org.apache.maven.plugins
-maven-gpg-plugin
-
-
-sign-artifacts
-verify
-
-sign
-
-
-
-
-
-org.apache.maven.plugins
-maven-javadoc-plugin
-
-
-attach-javadoc
-jar
-
-
-
-
-org.apache.maven.plugins
-maven-source-plugin
-
-
-attach-source
-jar
-
-
-
-
-
-
-
-
-struts-staging
-Apache Struts Staging Repository
-
scp://people.apache.org/www/people.apache.org/builds/struts/struts-annotations-${pom.version}/m2-staging-repository
-
-
-apache-site
-
scp://people.apache.org/www/struts.apache.org/struts-annotations/
-
-
-
-
-
-junit
-junit
-3.8.1
-test
-
-
org.freemarker
freemarker
[2/4] struts-annotations git commit: Adds ignored files
Adds ignored files Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/753c4419 Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/753c4419 Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/753c4419 Branch: refs/heads/master Commit: 753c4419812367aaf062841aa0f7d786435b58e2 Parents: 753f724 Author: Lukasz Lenart Authored: Tue Sep 29 08:25:22 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 29 08:25:22 2015 +0200 -- .gitignore | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/753c4419/.gitignore -- diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..987f5a6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio + +## Directory-based project format: +.idea/ + +## File-based project format: +*.ipr +*.iws +*.iml
[1/4] struts-annotations git commit: Adds basic readme
Repository: struts-annotations Updated Branches: refs/heads/master 7dabf8f1b -> 1457e57f5 Adds basic readme Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/753f7240 Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/753f7240 Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/753f7240 Branch: refs/heads/master Commit: 753f72406fcb166cdd4f3cd21e277d0202724c05 Parents: 7dabf8f Author: Lukasz Lenart Authored: Thu Mar 5 19:29:56 2015 +0100 Committer: Lukasz Lenart Committed: Thu Mar 5 19:29:56 2015 +0100 -- README.adoc | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/753f7240/README.adoc -- diff --git a/README.adoc b/README.adoc new file mode 100644 index 000..747c0ca --- /dev/null +++ b/README.adoc @@ -0,0 +1,2 @@ +# Struts Annotations Project +
[1/2] struts-annotations git commit: Sets proper SCM
Repository: struts-annotations Updated Branches: refs/heads/master 1457e57f5 -> 93fed50b5 Sets proper SCM Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/352c1f4e Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/352c1f4e Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/352c1f4e Branch: refs/heads/master Commit: 352c1f4eb5682280015d373580836b604355fb64 Parents: 1457e57 Author: Lukasz Lenart Authored: Tue Sep 29 08:53:33 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 29 08:53:33 2015 +0200 -- pom.xml | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/352c1f4e/pom.xml -- diff --git a/pom.xml b/pom.xml index 5c4c424..f357198 100644 --- a/pom.xml +++ b/pom.xml @@ -18,16 +18,25 @@ - scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts-annotations - scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts-annotations - http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations + scm:git:git://git.apache.org/struts-annotations.git + scm:git:https://git-wip-us.apache.org/repos/asf/struts-annotations.git +http://git.apache.org/struts-annotations.git +HEAD + +UTF-8 + org.apache.maven.plugins +maven-release-plugin +2.5 + + +org.apache.maven.plugins maven-compiler-plugin 3.3 @@ -36,12 +45,6 @@ -proc:none - -maven-release-plugin - - https://svn.apache.org/repos/asf/struts/maven/tags - - @@ -73,4 +76,5 @@ 2.3.11 +
[2/2] struts-annotations git commit: Reformats
Reformats
Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo
Commit:
http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/93fed50b
Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/93fed50b
Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/93fed50b
Branch: refs/heads/master
Commit: 93fed50b5069ea11f464f34ac0f792d83444fa21
Parents: 352c1f4
Author: Lukasz Lenart
Authored: Tue Sep 29 08:53:51 2015 +0200
Committer: Lukasz Lenart
Committed: Tue Sep 29 08:53:51 2015 +0200
--
pom.xml | 143 ++-
1 file changed, 72 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/93fed50b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f357198..ce5b89c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,80 +1,81 @@
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
-org.apache.struts
-struts-master
-9
-
+
+org.apache.struts
+struts-master
+9
+
-4.0.0
-struts-annotations
-1.0.6-SNAPSHOT
-jar
-Struts Annotations
-http://struts.apache.org
-
-struts-annotations adds apt generation support for struts based
annotated projects,
-such as TLD and documentation generation from annotated component
classes as used in struts2
-
+ 4.0.0
+ struts-annotations
+ 1.0.6-SNAPSHOT
+ jar
+ Struts Annotations
+ http://struts.apache.org
+
+struts-annotations adds apt generation support for struts based annotated
projects,
+such as TLD and documentation generation from annotated component classes
as used in struts2
+
-
-
scm:git:git://git.apache.org/struts-annotations.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/struts-annotations.git
-http://git.apache.org/struts-annotations.git
-HEAD
-
+
+
scm:git:git://git.apache.org/struts-annotations.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/struts-annotations.git
+http://git.apache.org/struts-annotations.git
+HEAD
+
-
-UTF-8
-
+
+UTF-8
+
-
-
-
-org.apache.maven.plugins
-maven-release-plugin
-2.5
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-3.3
-
-1.7
-1.7
--proc:none
-
-
-
-
+
+
+
+org.apache.maven.plugins
+maven-release-plugin
+2.5
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+3.3
+
+ 1.7
+ 1.7
+ -proc:none
+
+
+
+
-
-
-default-tools.jar
-
-
-java.vendor
-Sun Microsystems Inc.
-
-
-
-
-com.sun
-tools
-1.7.0
-system
-${java.home}/../lib/tools.jar
-
-
-
-
-
-
-
-org.freemarker
-freemarker
-2.3.11
+
+
+ default-tools.jar
+
+
+ java.vendor
+ Sun Microsystems Inc.
+
+
+
+
+ com.sun
+ tools
+ 1.7.0
+ system
+ ${java.home}/../lib/tools.jar
-
+
+
+
+
+
+
+ org.freemarker
+ freemarker
+ 2.3.11
+
+
struts-annotations git commit: Adds plugins management section
Repository: struts-annotations Updated Branches: refs/heads/master 93fed50b5 -> bb81be823 Adds plugins management section Project: http://git-wip-us.apache.org/repos/asf/struts-annotations/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-annotations/commit/bb81be82 Tree: http://git-wip-us.apache.org/repos/asf/struts-annotations/tree/bb81be82 Diff: http://git-wip-us.apache.org/repos/asf/struts-annotations/diff/bb81be82 Branch: refs/heads/master Commit: bb81be823a1986ca0761505ed9d6fa9860646dac Parents: 93fed50 Author: Lukasz Lenart Authored: Tue Sep 29 08:59:34 2015 +0200 Committer: Lukasz Lenart Committed: Tue Sep 29 08:59:34 2015 +0200 -- pom.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts-annotations/blob/bb81be82/pom.xml -- diff --git a/pom.xml b/pom.xml index ce5b89c..9518a3d 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,17 @@ + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5 + + + + org.apache.maven.plugins @@ -47,6 +58,7 @@ +
