You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/05/02 17:03:30 UTC
[1/5] git commit: Correct type with release-plugin version
Repository: struts
Updated Branches:
refs/heads/hotfix/2.3.16.3 [created] 0761909c6
Correct type with release-plugin version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dbcdbd0d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dbcdbd0d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dbcdbd0d
Branch: refs/heads/hotfix/2.3.16.3
Commit: dbcdbd0d129657ddceafbd8df36406e4bb7b7b91
Parents: 7dd83df
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 1 11:21:13 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 1 11:21:13 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/dbcdbd0d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc336c1..579ddcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.52</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[4/5] git commit: Sets version in poms to -SNAPSHOT
Posted by lu...@apache.org.
Sets version in poms to -SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bca525da
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bca525da
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bca525da
Branch: refs/heads/hotfix/2.3.16.3
Commit: bca525da8ddf73da634b7e906254a66294293909
Parents: 769e815
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 15:36:19 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 15:36:19 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 ++--
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 4 ++--
archetypes/struts2-archetype-blank/pom.xml | 4 ++--
archetypes/struts2-archetype-convention/pom.xml | 4 ++--
archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++--
archetypes/struts2-archetype-plugin/pom.xml | 4 ++--
archetypes/struts2-archetype-portlet/pom.xml | 4 ++--
archetypes/struts2-archetype-starter/pom.xml | 4 ++--
assembly/pom.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 4 ++--
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 2 +-
xwork-core/pom.xml | 2 +-
51 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 6054fc4..81a88d5 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 0aebae0..b77c977 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index f2fc344..bb7ae7c 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index a16b4d7..3444414 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index f98d72b..e105aab 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index b0c6589..55d5d5f 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Example</name>
<description>Struts 2 Rest Showcase Example</description>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 6cf2aef..9d52e4b 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index bf9b7f8..fcf351b 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index a15b957..3f40657 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-angularjs</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Angular JS</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 237b35a..00a6f4b 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,12 +3,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index aa3e820..fca83b0 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index c1e7749..15a48ed 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 8535f80..bdb702f 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Plugin</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index a3baed8..1bc6d9f 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 229a591..935b471 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Starter</name>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 56a551b..95b3a0c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index e9fdc78..5ea89c4 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index a8613a3..0f67c7d 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index b86c91f..f896c0c 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 02aee40..6404358 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 8cd0325..ba6bbf2 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index e978b79..78701b2 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-codebehind-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 284f1c7..7a9016b 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a55a797..54346ba 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 29846ea..f0f950d 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index dba899b..76259d2 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 51488be..19b85fc 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 5ef6f6b..d984aca 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 3cf1c94..45d22b2 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index e3a44c4..6d3ff2d 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 849c815..bb888b9 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 33d00ea..3f284ab 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-jsf-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 444d311..f77b226 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 2571fcb..6d02695 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 11e2c22..2762bfa 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 457383f..997b2a7 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index b2ab339..307fc05 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 8569137..79ce6af 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d98fc9a..0d764e6 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 9d41d84..a937e7c 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 8134dad..4bea2e7 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index aec4075..3c416a4 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<name>Struts 2 REST Plugin</name>
<properties>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 243b1d2..829f883 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitegraph-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 3c7b1b8..717c2bf 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 6bcf252..c5bf45b 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index fb84799..fbbd4f1 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-struts1-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index eec0caf..6879f54 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 47b3980..f3fa2b6 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 77fb083..2204fcf 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles3-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 579ddcb..638a5bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 34fe8e2..9d1c34c 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.3.16.2</version>
+ <version>2.3.16.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.xwork</groupId>
[3/5] git commit: Uses wget to fetch docs instead re-exporting pages
from wiki
Posted by lu...@apache.org.
Uses wget to fetch docs instead re-exporting pages from wiki
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/769e815c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/769e815c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/769e815c
Branch: refs/heads/hotfix/2.3.16.3
Commit: 769e815c6e0a72b25812ff1c4526105be9491e0c
Parents: 1a668af
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 15:35:31 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 15:35:31 2014 +0200
----------------------------------------------------------------------
assembly/pom.xml | 86 +++++++++++++++++++++------------------------------
1 file changed, 36 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/769e815c/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7984c29..56a551b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -77,6 +77,42 @@
</plugin>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cwiki-docs</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}/cwiki/" />
+ <exec executable="wget">
+ <arg value="-erobots=off" />
+ <arg value="-nH" />
+ <arg value="--cut-dirs=3" />
+ <arg value="-nv" />
+ <arg value="-E" />
+ <arg value="-L" />
+ <arg value="-l 0" />
+ <arg value="-np" />
+ <arg value="--directory-prefix=${project.build.directory}/cwiki" />
+ <arg value="--no-check-certificate" />
+ <arg value="-r" />
+ <arg value="http://struts.apache.org/development/2.x/docs/" />
+ </exec>
+ <delete>
+ <fileset dir="${project.build.directory}/cwiki/" includes="**/index.*" />
+ </delete>
+ <copy file="${project.build.directory}/cwiki/home.html" tofile="${project.build.directory}/cwiki/index.html" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -103,59 +139,9 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>export-cwiki</id>
- <activation>
- <property>
- <name>!skipWiki</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>cwiki-docs</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <classpathScope>runtime</classpathScope>
- <includeProjectDependencies>true</includeProjectDependencies>
- <mainClass>org.apache.cxf.cwiki.SiteExporter</mainClass>
- <arguments>
- <argument>-d</argument>
- <argument>${project.build.directory}/cwiki/WW</argument>
- <argument>-password</argument>
- <argument>${confluence.password}</argument>
- <argument>-user</argument>
- <argument>${confluence.user}</argument>
- <argument>${basedir}/src/main/resources/docs.cfg</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
- <groupId>org.apache.cxf.site-export</groupId>
- <artifactId>cxf-site-export</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-cdi-plugin</artifactId>
</dependency>
[2/5] git commit: Uses the same logic as in ParametersInterceptor to
use st of patterns to exclude cookies which tries to access Struts internal
state
Posted by lu...@apache.org.
Uses the same logic as in ParametersInterceptor to use st of patterns
to exclude cookies which tries to access Struts internal state
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1a668af7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1a668af7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1a668af7
Branch: refs/heads/hotfix/2.3.16.3
Commit: 1a668af7f1ffccea4a3b46d8d8c1fe1c7331ff02
Parents: dbcdbd0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 1 11:31:12 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 1 11:31:12 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------
.../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++
2 files changed, 82 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 3e2e81d..340b57f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -33,6 +33,7 @@ import org.apache.struts2.ServletActionContext;
import javax.servlet.http.Cookie;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -175,7 +176,13 @@ public class CookieInterceptor extends AbstractInterceptor {
// Allowed names of cookies
private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN, Pattern.CASE_INSENSITIVE);
- private Pattern excludedPattern = Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN, Pattern.CASE_INSENSITIVE);
+ private Set<Pattern> excludedPatterns = new HashSet<Pattern>();
+
+ public CookieInterceptor() {
+ for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
+ excludedPatterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
+ }
+ }
/**
* Set the <code>cookiesName</code> which if matched will allow the cookie
@@ -253,13 +260,16 @@ public class CookieInterceptor extends AbstractInterceptor {
* @return true|false
*/
protected boolean isAcceptableValue(String value) {
- boolean matches = !excludedPattern.matcher(value).matches();
- if (!matches) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+ for (Pattern excludedPattern : excludedPatterns) {
+ boolean matches = !excludedPattern.matcher(value).matches();
+ if (!matches) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie value [#0] matches excludedPattern [#1]", value, excludedPattern.toString());
+ }
+ return false;
}
}
- return matches;
+ return true;
}
/**
@@ -293,23 +303,26 @@ public class CookieInterceptor extends AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #excludedPattern}
+ * Checks if name of Cookie match {@link #excludedPatterns}
*
* @param name of Cookie
* @return true|false
*/
protected boolean isExcluded(String name) {
- boolean matches = excludedPattern.matcher(name).matches();
- if (matches) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
- }
- } else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+ for (Pattern excludedPattern : excludedPatterns) {
+ boolean matches = excludedPattern.matcher(name).matches();
+ if (matches) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] matches excludedPattern [#1]", name, excludedPattern.toString());
+ }
+ return true;
+ } else {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]", name, excludedPattern.toString());
+ }
}
}
- return matches;
+ return false;
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index d1014a8..99ba151 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -383,6 +383,59 @@ public class CookieInterceptorTest extends StrutsInternalTestCase {
assertFalse(excludedValue.get(pollution6));
}
+ public void testCookiesWithStrutsInternalsAccess() throws Exception {
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ String sessionCookieName = "session.userId";
+ String sessionCookieValue = "session.userId=1";
+ String appCookieName = "application.userId";
+ String appCookieValue = "application.userId=1";
+ String reqCookieName = "request.userId";
+ String reqCookieValue = "request.userId=1";
+
+ request.setCookies(
+ new Cookie(sessionCookieName, "1"),
+ new Cookie("1", sessionCookieValue),
+ new Cookie(appCookieName, "1"),
+ new Cookie("1", appCookieValue),
+ new Cookie(reqCookieName, "1"),
+ new Cookie("1", reqCookieValue)
+ );
+ ServletActionContext.setRequest(request);
+
+ final Map<String, Boolean> excludedName = new HashMap<String, Boolean>();
+ final Map<String, Boolean> excludedValue = new HashMap<String, Boolean>();
+
+ CookieInterceptor interceptor = new CookieInterceptor() {
+ @Override
+ protected boolean isAcceptableName(String name) {
+ boolean accepted = super.isAcceptableName(name);
+ excludedName.put(name, accepted);
+ return accepted;
+ }
+
+ @Override
+ protected boolean isAcceptableValue(String value) {
+ boolean accepted = super.isAcceptableValue(value);
+ excludedValue.put(value, accepted);
+ return accepted;
+ }
+ };
+ interceptor.setCookiesName("*");
+
+ MockActionInvocation invocation = new MockActionInvocation();
+ invocation.setAction(new MockActionWithCookieAware());
+
+ interceptor.intercept(invocation);
+
+ assertFalse(excludedName.get(sessionCookieName));
+ assertFalse(excludedName.get(appCookieName));
+ assertFalse(excludedName.get(reqCookieName));
+
+ assertFalse(excludedValue.get(sessionCookieValue));
+ assertFalse(excludedValue.get(appCookieValue));
+ assertFalse(excludedValue.get(reqCookieValue));
+ }
+
public static class MockActionWithCookieAware extends ActionSupport implements CookiesAware {
private static final long serialVersionUID = -6202290616812813386L;
[5/5] git commit: Updates docs assembly with new location of exported
pages
Posted by lu...@apache.org.
Updates docs assembly with new location of exported pages
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0761909c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0761909c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0761909c
Branch: refs/heads/hotfix/2.3.16.3
Commit: 0761909c65f32a0df9fc392704bf9d248bfea2c8
Parents: bca525d
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri May 2 15:47:34 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri May 2 15:47:34 2014 +0200
----------------------------------------------------------------------
assembly/src/main/assembly/docs.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/0761909c/assembly/src/main/assembly/docs.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 77dffcb..b1f9991 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -47,7 +47,7 @@
<!-- Include the Confluence docs in the assembly -->
<fileSet>
- <directory>target/cwiki/WW/docs</directory>
+ <directory>target/cwiki/</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>