From 8c1738d719919540492012047e360ba66fe6ba21 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Fri, 4 May 2012 22:27:37 +0000 Subject: [PATCH 01/65] [maven-release-plugin] copy for branch TILES_3_0_X git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1334240 13f79535-47bb-0310-9956-ffa450edef68 From 057b258761ced64e3fbc6a1bf41b381cb1d1e6fc Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Fri, 4 May 2012 22:55:01 +0000 Subject: [PATCH 02/65] [maven-release-plugin] prepare release tiles-parent-3.0.0 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1334246 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 39a117712..133e5acb6 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.0/assembly diff --git a/pom.xml b/pom.xml index 77ea58404..4dde4b605 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0 + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0 + http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.0 diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 56bee5b32..e50dd5aee 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 681e18262..83fd81875 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index befbeec4a..bab648d29 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 7c4d7e3a5..29eb7bb68 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index ee8fb08b9..e087f7c1c 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index a0edddaa7..dabd3a52b 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 1b5fe3de0..4d99596ab 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 6fefc47dc..8cf03a4d6 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index 15767ef54..e7dcf9ae3 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index e9a30afe7..9d4129819 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index af5f2ff70..2042c8d0d 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 007bce165..36e0707dc 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index f28be4333..e2ffef893 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index 7adcbeb1d..2af57540a 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 org.apache.tiles tiles-test-common - 3.0.0-SNAPSHOT + 3.0.0 Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index c6be09cbc..c790358cd 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index f0f2ba80b..c931609cf 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 8c4522b8e..99229a446 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.0-SNAPSHOT + 3.0.0 4.0.0 From 5b5d43bc2149f800941f946033b3cab6a8052a47 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Fri, 4 May 2012 22:55:16 +0000 Subject: [PATCH 03/65] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1334248 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 133e5acb6..df68a663d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.0/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly diff --git a/pom.xml b/pom.xml index 4dde4b605..85e9cbc40 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0 - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.0 - http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.0 + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index e50dd5aee..937544722 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 83fd81875..99edb6216 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index bab648d29..2a125f244 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 29eb7bb68..940169944 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index e087f7c1c..517b5dfb0 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index dabd3a52b..8887574dd 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 4d99596ab..6bcb011a8 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 8cf03a4d6..381bb44d9 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index e7dcf9ae3..ee5536a40 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 9d4129819..e49b64e80 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 2042c8d0d..4633f65c8 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 36e0707dc..0b27f75ef 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index e2ffef893..fb3bb885c 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index 2af57540a..fcb4de231 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT org.apache.tiles tiles-test-common - 3.0.0 + 3.0.1-SNAPSHOT Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index c790358cd..ae13bbdaa 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index c931609cf..d62a29c12 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 99229a446..86dc15e41 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.0 + 3.0.1-SNAPSHOT 4.0.0 From 27d76830ad9348d2c54f324be4cbbcf78e9798de Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 19:45:40 +0000 Subject: [PATCH 04/65] TILES-549 - Improve code quality (post 3.0 release) TILES-552: Update the poms and the documentation on the release process TILES-548: mvn release:perfom fails on Maven 3.0.4 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360370 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 9 +- src/site/apt/dev/release.apt | 41 ++---- .../extras/renderer/OptionsRenderer.java | 66 +++++---- .../tiles/extras/renderer/package-info.java | 27 ++++ .../extras/renderer/OptionsRendererTest.java | 139 ++++++++++++++++++ 5 files changed, 221 insertions(+), 61 deletions(-) create mode 100644 tiles-extras/src/main/java/org/apache/tiles/extras/renderer/package-info.java create mode 100644 tiles-extras/src/test/java/org/apache/tiles/extras/renderer/OptionsRendererTest.java diff --git a/assembly/pom.xml b/assembly/pom.xml index df68a663d..1421076a9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -123,7 +123,14 @@ org.codehaus.mojo wagon-maven-plugin - 1.0-beta-4 + 1.0 + + + org.apache.maven.wagon + wagon-ssh + 1.0 + + deploy diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt index ab9bd52c0..d99e3becb 100644 --- a/src/site/apt/dev/release.apt +++ b/src/site/apt/dev/release.apt @@ -136,8 +136,10 @@ mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD ----------------------------------- The plugin interactively will ask you the version to release, the Subversion - tag to use and the next snapshot version. It is reccomended to use the tag: + tag to use and the next snapshot version. It is recommended to use the tag: <>. + + See also {{{http://www.apache.org/dev/publishing-maven-artifacts.html}the recommendations of the ASF}}. * Perform the Release @@ -146,6 +148,8 @@ mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD ----------------------------------- mvn release:perform ----------------------------------- + + It should compile and test everything, build and upload the artifacts and the website for the project. * Close the staging repository @@ -168,32 +172,11 @@ mvn release:perform Note the repository URL, you will need this in your vote email. -* Digest and upload assemblies +* Verify the uploaded assemblies - * Go into the release assembly target directory: - ------------------------------------ -cd target/checkout/assembly/target/assembly/out ------------------------------------ - - * Create MD5 and SHA1 files for each files (including ASC files). You can do - it with this simple shell script: - ------------------------------------ -#!/bin/sh - -for fileitem in * -do - openssl md5 < $fileitem > $fileitem.md5 - openssl sha1 < $fileitem > $fileitem.sha1 -done ------------------------------------ - - * Upload everything to the build site: - ------------------------------------ -scp * user@people.apache.org:/www/people.apache.org/builds/tiles/${version} ------------------------------------ + * go to the destination directory on people.apache.org (cd /www/people.apache.org/builds/tiles/${version}). + + * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1). * Release the JIRA version @@ -334,11 +317,11 @@ http://tiles.apache.org/download.html It is also available in the central Maven repository under Group ID "org.apache.tiles". -The 2.0.x series of the Apache Tiles framework has a minimum +The 3.0.x series of the Apache Tiles framework has a minimum requirement of the following specification versions: -* Java Servlet 2.4 and JavaServer Pages (JSP) 2.0 -* Java Standard Edition (Java SE) 1.5 +* Java Servlet 2.5 and JavaServer Pages (JSP) 2.1 +* Java Standard Edition (Java SE) 1.6 The release notes are available online at: diff --git a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java index 49b3151eb..77aac7a8f 100644 --- a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java +++ b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java @@ -40,30 +40,33 @@ /** * Provides a custom "options" syntax for attributes. * The first option that can be rendered is. - * Comes from http://tech.finn.no/the-ultimate-view/

+ * Comes from The Ultimate View article.

* - * Actual rendering is delegated to the TypeDetectingRenderer that's supplied in the constructor. + * Actual rendering is delegated to the TypeDetectingRenderer that's supplied in the constructor.

* * For example: * "/WEB-INF/tiles/fragments/${options[myoptions]}/content.jsp" * given the myptions list-attribute is defined like: * 

-        
-            
-                
-                
-                
-            
-        
+        <put-list-attribute name="myoptions">
+            <add-list-attribute>
+                <add-attribute value="car"/>
+                <add-attribute value="vechile"/>
+                <add-attribute value="advert"/>
+            </add-list-attribute>
+        </put-list-attribute>
- * will look for content.jsp - * first in "/WEB-INF/tiles/fragments/car/" then - * second in "/WEB-INF/tiles/fragments/vechile/" and + * will look for content.jsp
+ * first in "/WEB-INF/tiles/fragments/car/" then
+ * second in "/WEB-INF/tiles/fragments/vechile/" and
* last in "/WEB-INF/tiles/fragments/advert". *

*

* Currently only supports one occurrance of such an "option" pattern in the attribute's value. * + * Limitation: "looking" for templates is implemented using applicationContext.getResource(..) + * therefore the option values in the options list need to be visible as applicationResources. + * */ public final class OptionsRenderer implements Renderer { @@ -75,7 +78,7 @@ public final class OptionsRenderer implements Renderer { private final ApplicationContext applicationContext; private final Renderer renderer; - public OptionsRenderer(final ApplicationContext applicationContext, final Renderer renderer){ + public OptionsRenderer(final ApplicationContext applicationContext, final Renderer renderer) { this.applicationContext = applicationContext; this.renderer = renderer; } @@ -98,16 +101,17 @@ public void render(final String path, final Request request) throws IOException .getAttributeContext(request) .getAttribute(match); - if(null == fallbacks){ + if (null == fallbacks) { throw new IllegalStateException("A matching list-attribute name=\"" + match + "\" must be defined."); - }else if(fallbacks.getValue().isEmpty()){ - throw new IllegalStateException("list-attribute name=\"" + match + "\" must have minimum one attribute"); + } else if (fallbacks.getValue().isEmpty()) { + throw new IllegalStateException( + "list-attribute name=\"" + match + "\" must have minimum one attribute"); } for (Attribute option : (List) fallbacks.getValue()) { - String template = path.replaceFirst(Pattern.quote(matcher.group()), (String)option.getValue()); + String template = path.replaceFirst(Pattern.quote(matcher.group()), (String) option.getValue()); done = renderAttempt(template, request); - if(done){ break; } + if (done) { break; } } if (!done) { throw new IOException("None of the options existed for " + path); @@ -117,9 +121,9 @@ public void render(final String path, final Request request) throws IOException } } - private boolean renderAttempt(final String template, final Request request) throws IOException{ + private boolean renderAttempt(final String template, final Request request) throws IOException { boolean result = false; - if(!Cache.isTemplateMissing(template)){ + if (!Cache.isTemplateMissing(template)) { try { if (null != applicationContext.getResource(template)) { // can throw FileNotFoundException ! renderer.render(template, request); // can throw FileNotFoundException ! @@ -127,14 +131,14 @@ private boolean renderAttempt(final String template, final Request request) thro Cache.setIfAbsentTemplateFound(template, true); } } catch (FileNotFoundException ex) { - if(ex.getMessage().contains(template)){ + if (ex.getMessage().contains(template)) { // expected outcome. continue loop. LOG.trace(ex.getMessage()); - }else{ + } else { // comes from an inner templateAttribute.render(..) so throw on throw ex; } - } catch(IOException ex){ //xxx ??? + } catch (IOException ex) { //xxx ??? throw ex; } Cache.setIfAbsentTemplateFound(template, false); @@ -142,14 +146,14 @@ private boolean renderAttempt(final String template, final Request request) thro return result; } - private static final class Cache{ + private static final class Cache { /** It takes CACHE_LIFE milliseconds for any hot deployments to register. */ private static final ConcurrentMap TEMPLATE_EXISTS = new ConcurrentHashMap(); - private volatile static long cacheLastCleaned = System.currentTimeMillis(); + private static volatile long cacheLastCleaned = System.currentTimeMillis(); private static final String CACHE_LIFE_PROPERTY = Cache.class.getName() + ".ttl_ms"; @@ -163,22 +167,22 @@ private static final class Cache{ ? Long.getLong(CACHE_LIFE_PROPERTY) : 1000 * 60 * 5; - static boolean isTemplateMissing(final String template){ - if(0 < CACHE_LIFE && System.currentTimeMillis() > cacheLastCleaned + CACHE_LIFE){ + static boolean isTemplateMissing(final String template) { + if (0 < CACHE_LIFE && System.currentTimeMillis() > cacheLastCleaned + CACHE_LIFE) { cacheLastCleaned = System.currentTimeMillis(); TEMPLATE_EXISTS.clear(); return false; - }else{ + } else { return TEMPLATE_EXISTS.containsKey(template) && !TEMPLATE_EXISTS.get(template); } } - static void setIfAbsentTemplateFound(final String template, final boolean found){ - if(0 < CACHE_LIFE && !TEMPLATE_EXISTS.containsKey(template)){ + static void setIfAbsentTemplateFound(final String template, final boolean found) { + if (0 < CACHE_LIFE && !TEMPLATE_EXISTS.containsKey(template)) { TEMPLATE_EXISTS.putIfAbsent(template, found); } } - private Cache(){} + private Cache() {} } } diff --git a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/package-info.java b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/package-info.java new file mode 100644 index 000000000..f41d8f61f --- /dev/null +++ b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/package-info.java @@ -0,0 +1,27 @@ +/* + * $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. + */ +/** + * Provides a custom "options" syntax for attributes. + * The first option from a list that can be rendered is. + * + * Comes from The Ultimate View article. + */ +package org.apache.tiles.extras.renderer; diff --git a/tiles-extras/src/test/java/org/apache/tiles/extras/renderer/OptionsRendererTest.java b/tiles-extras/src/test/java/org/apache/tiles/extras/renderer/OptionsRendererTest.java new file mode 100644 index 000000000..765aa711b --- /dev/null +++ b/tiles-extras/src/test/java/org/apache/tiles/extras/renderer/OptionsRendererTest.java @@ -0,0 +1,139 @@ +/* + * $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.tiles.extras.renderer; + +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.util.Collection; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import org.apache.tiles.Attribute; +import org.apache.tiles.ListAttribute; +import org.apache.tiles.access.TilesAccess; +import org.apache.tiles.impl.BasicTilesContainer; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.ApplicationResource; + +import org.apache.tiles.request.Request; +import org.apache.tiles.request.locale.PostfixedApplicationResource; +import org.apache.tiles.request.render.StringRenderer; +import org.junit.Test; + +/** + * Tests {@link OptionsRenderer}. + * + * @version $Rev$ $Date$ + */ +public final class OptionsRendererTest { + + private final BasicTilesContainer container = new BasicTilesContainer(); + + private final Map appScope = new HashMap(){{ + put(TilesAccess.CONTAINER_ATTRIBUTE, container); + }}; + + private final Map requestScope = new HashMap(); + + private final ApplicationResource template = new PostfixedApplicationResource("Result"){ + @Override + public InputStream getInputStream() throws IOException { + throw new AssertionError("Shouldn't be called."); + } + @Override + public long getLastModified() throws IOException { + return 0; + } + }; + + private final ApplicationContext context = new ApplicationContext(){ + @Override + public Object getContext() { + throw new AssertionError("Shouldn't be called."); + } + @Override + public Map getApplicationScope() { + return appScope; + } + @Override + public Map getInitParams() { + throw new AssertionError("Shouldn't be called."); + } + @Override + public ApplicationResource getResource(String string) { + return template; + } + @Override + public ApplicationResource getResource(ApplicationResource ar, Locale locale) { + throw new AssertionError("Shouldn't be called."); + } + @Override + public Collection getResources(String string) { + throw new AssertionError("Shouldn't be called."); + } + }; + + /** + * Tests + * {@link OptionsRenderer#render(String, Request)}. + * + * @throws IOException If something goes wrong during rendition. + */ + @Test + public void testWrite() throws IOException { + StringWriter writer = new StringWriter(); + Request request = createMock(Request.class); + + requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); + + expect(request.getContext(matches("request"))).andReturn(requestScope).anyTimes(); + expect(request.getApplicationContext()).andReturn(context); + expect(request.getWriter()).andReturn(writer); + replay(request); + + container + .getAttributeContext(request) + .putAttribute("test-fallback", new ListAttribute(){{ + add(new Attribute("Result")); + }}); + + OptionsRenderer renderer = new OptionsRenderer(context, new StringRenderer()); + renderer.render("{options[test-fallback]}", request); + writer.close(); + assertEquals("Not written 'Result'", "Result", writer.toString()); + verify(request); + } + + /** + * Tests + * {@link OptionsRenderer#isRenderable(String, Request)}. + */ + @Test + public void testIsRenderable() { + Request requestContext = createMock(Request.class); + OptionsRenderer renderer = new OptionsRenderer(context, new StringRenderer()); + assertTrue(renderer.isRenderable("any-string", requestContext)); + } +} From d5f20ef07e717ab54f9b5df38ee5f269903a4fc8 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 19:52:00 +0000 Subject: [PATCH 05/65] update to autotag 1.1 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360373 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- tiles-freemarker/pom.xml | 1 + tiles-jsp/pom.xml | 1 + .../java/org/apache/tiles/jsp/taglib/UseAttributeTag.java | 3 ++- tiles-velocity/pom.xml | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 85e9cbc40..95511de0e 100644 --- a/pom.xml +++ b/pom.xml @@ -312,8 +312,8 @@ target/osgi/MANIFEST.MF UTF-8 - 1.0.0 - 1.0.0 + 1.0.1 + 1.1.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index 8887574dd..e03670336 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -45,6 +45,7 @@ org.apache.tiles.freemarker.template + org.apache.tiles.request.Request org.apache.tiles.request.freemarker.autotag.FreemarkerAutotagRuntime diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 6bcb011a8..b3afe0e48 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -81,6 +81,7 @@ http://tiles.apache.org/tags-tiles org.apache.tiles.jsp.taglib + org.apache.tiles.request.Request org.apache.tiles.request.jsp.autotag.JspAutotagRuntime diff --git a/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java b/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java index 0e90721ee..1d61fa77a 100644 --- a/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java +++ b/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java @@ -22,6 +22,7 @@ package org.apache.tiles.jsp.taglib; import java.io.IOException; + import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.SimpleTagSupport; import javax.servlet.jsp.tagext.TagData; @@ -177,7 +178,7 @@ public void setClassname(String name) { /** {@inheritDoc} */ @Override public void doTag() throws JspException, IOException { - AutotagRuntime runtime = new org.apache.tiles.request.jsp.autotag.JspAutotagRuntime(); + AutotagRuntime runtime = new org.apache.tiles.request.jsp.autotag.JspAutotagRuntime(); if (runtime instanceof SimpleTagSupport) { SimpleTagSupport tag = (SimpleTagSupport) runtime; tag.setJspContext(getJspContext()); diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 86dc15e41..d7565b4a8 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -46,6 +46,7 @@ org.apache.tiles.velocity.template + org.apache.tiles.request.Request org.apache.tiles.request.velocity.autotag.VelocityAutotagRuntime From 5a6180caa028b4844c77925d8b34dc9fdeb5d86e Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 19:53:04 +0000 Subject: [PATCH 06/65] TILES-548: mvn release:perfom fails on Maven 3.0.4 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360374 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 1421076a9..001d0f828 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -58,6 +58,13 @@ + + + org.apache.maven.wagon + wagon-ssh + 1.0 + + @@ -123,14 +130,7 @@ org.codehaus.mojo wagon-maven-plugin - 1.0 - - - org.apache.maven.wagon - wagon-ssh - 1.0 - - + 1.0-beta-4 deploy From cba6cb060e96f618a790dad68a33520b2d28231b Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 19:59:22 +0000 Subject: [PATCH 07/65] [maven-release-plugin] prepare release tiles-parent-3.0.1 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360375 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 001d0f828..7253130d5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.1/assembly diff --git a/pom.xml b/pom.xml index 95511de0e..cf0b0183f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 + http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.1 diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 937544722..ece72cc54 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 99edb6216..cecc785e1 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index 2a125f244..c27f34cfe 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 940169944..3b86c1db7 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 517b5dfb0..c99e4d488 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index e03670336..a46342571 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index b3afe0e48..877443d92 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 381bb44d9..a91727d96 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index ee5536a40..4cef897a5 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index e49b64e80..37e77eb95 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 4633f65c8..5150e4f29 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 0b27f75ef..d35f727de 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index fb3bb885c..c38767049 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index fcb4de231..be9ae32ee 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 org.apache.tiles tiles-test-common - 3.0.1-SNAPSHOT + 3.0.1 Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index ae13bbdaa..ea0e59386 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index d62a29c12..fe83fcb56 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index d7565b4a8..8c8794d44 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 From e2d70b5388532e49a49820e0662234122db8af44 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 19:59:59 +0000 Subject: [PATCH 08/65] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360377 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 7253130d5..08e10a740 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.1/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly diff --git a/pom.xml b/pom.xml index cf0b0183f..d996d1b87 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 - http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.1 + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index ece72cc54..738a14af3 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index cecc785e1..67213a5e7 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index c27f34cfe..ccf112d2c 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 3b86c1db7..0e0371d14 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index c99e4d488..0f7058a3b 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index a46342571..f4a00f0e5 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 877443d92..463c4ad7b 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index a91727d96..9bedf8630 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index 4cef897a5..f52d395d8 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 37e77eb95..2022bd3b9 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 5150e4f29..cddb882b1 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index d35f727de..29c84b66c 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index c38767049..20439095c 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index be9ae32ee..2fe1dbfd9 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT org.apache.tiles tiles-test-common - 3.0.1 + 3.0.2-SNAPSHOT Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index ea0e59386..de05a0550 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index fe83fcb56..4a50216fa 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 8c8794d44..ace0eba3c 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 From 0261c4cd641f4e6f0bb19293ad8b5c11bcd24762 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 21:53:17 +0000 Subject: [PATCH 09/65] [maven-release-plugin] rollback the release of tiles-parent-3.0.1 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360430 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 2 +- pom.xml | 2 +- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 08e10a740..001d0f828 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,7 +30,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index d996d1b87..95511de0e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT pom Tiles 3 Tiles 3: A framework for page composition. diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 738a14af3..937544722 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 67213a5e7..99edb6216 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index ccf112d2c..2a125f244 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 0e0371d14..940169944 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 0f7058a3b..517b5dfb0 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index f4a00f0e5..e03670336 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 463c4ad7b..b3afe0e48 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 9bedf8630..381bb44d9 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index f52d395d8..ee5536a40 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 2022bd3b9..e49b64e80 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index cddb882b1..4633f65c8 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 29c84b66c..0b27f75ef 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index 20439095c..fb3bb885c 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index 2fe1dbfd9..fcb4de231 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT org.apache.tiles tiles-test-common - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index de05a0550..ae13bbdaa 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index 4a50216fa..d62a29c12 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index ace0eba3c..d7565b4a8 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT 4.0.0 From af6818ddb4b80246ec81aa77c1b0a4bf0915dcb9 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 21:58:20 +0000 Subject: [PATCH 10/65] TILES-548: mvn release:perfom fails on Maven 3.0.4 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360431 13f79535-47bb-0310-9956-ffa450edef68 --- tiles-test-pom/tiles-test/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index d62a29c12..c0b2a974c 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -163,6 +163,13 @@ ${project.artifactId} + + + org.apache.maven.wagon + wagon-ssh + 1.0 + + From b17200394c43f302c3ac7582b9ab737ec6b2e247 Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 22:02:32 +0000 Subject: [PATCH 11/65] [maven-release-plugin] prepare release tiles-parent-3.0.1 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360434 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 001d0f828..7253130d5 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.1/assembly diff --git a/pom.xml b/pom.xml index 95511de0e..cf0b0183f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 + http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.1 diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 937544722..ece72cc54 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 99edb6216..cecc785e1 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index 2a125f244..c27f34cfe 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 940169944..3b86c1db7 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 517b5dfb0..c99e4d488 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index e03670336..a46342571 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index b3afe0e48..877443d92 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 381bb44d9..a91727d96 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index ee5536a40..4cef897a5 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index e49b64e80..37e77eb95 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 4633f65c8..5150e4f29 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 0b27f75ef..d35f727de 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index fb3bb885c..c38767049 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index fcb4de231..be9ae32ee 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 org.apache.tiles tiles-test-common - 3.0.1-SNAPSHOT + 3.0.1 Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index ae13bbdaa..ea0e59386 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index c0b2a974c..a7a483f0c 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index d7565b4a8..8c8794d44 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.1-SNAPSHOT + 3.0.1 4.0.0 From edc09b27b37fbe54d9b2c318c6f1bfc5382a43ea Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Wed, 11 Jul 2012 22:03:45 +0000 Subject: [PATCH 12/65] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1360441 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 7253130d5..08e10a740 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.1/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly diff --git a/pom.xml b/pom.xml index cf0b0183f..d996d1b87 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.1 - http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.1 + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index ece72cc54..738a14af3 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index cecc785e1..67213a5e7 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index c27f34cfe..ccf112d2c 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 3b86c1db7..0e0371d14 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index c99e4d488..0f7058a3b 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index a46342571..f4a00f0e5 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 877443d92..463c4ad7b 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index a91727d96..9bedf8630 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index 4cef897a5..f52d395d8 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 37e77eb95..2022bd3b9 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 5150e4f29..cddb882b1 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index d35f727de..29c84b66c 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index c38767049..20439095c 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index be9ae32ee..2fe1dbfd9 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT org.apache.tiles tiles-test-common - 3.0.1 + 3.0.2-SNAPSHOT Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index ea0e59386..de05a0550 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index a7a483f0c..9e281d96c 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 8c8794d44..ace0eba3c 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.1 + 3.0.2-SNAPSHOT 4.0.0 From ca1adae758566624b3e9de84c262f1c6baef02e5 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Tue, 1 Jan 2013 22:22:03 +0000 Subject: [PATCH 13/65] backport r1427572 `svn merge -c1427572 ^/tiles/framework/trunk` http://svn.apache.org/viewvc?view=revision&revision=1427572 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1427575 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/tutorial/advanced/wildcard.apt | 105 ++++++++++++++++++-- 1 file changed, 99 insertions(+), 6 deletions(-) diff --git a/src/site/apt/tutorial/advanced/wildcard.apt b/src/site/apt/tutorial/advanced/wildcard.apt index 4b0b24443..383983104 100644 --- a/src/site/apt/tutorial/advanced/wildcard.apt +++ b/src/site/apt/tutorial/advanced/wildcard.apt @@ -26,9 +26,64 @@ Wildcard support By default, Tiles supports wildcards in definition names. Wilcards help a lot in writing less code to declare your definitions. - There are two styles: +* Default configuration - * the wildcard-based style (available by default): + Note: default configuration only works if you do not use <<>>. If you are using this setting, you can move to the next section. + + Let us start with a simple example. When not using wildcards, you might end up with such tiles definitions: + +----------------------------------- + + + + + + + + + + + + + + +------------------------------------ + + The above definitions are pretty verbose as you need to create one definition per JSP that you're adding to your application. + You could use definition inheritance to reduce the number of lines but you would still need one definition per JSP. + + +** Single star '\*' + + Let's see how to improve that using wildcards. You would then have: + +------------------------------------ + + + + + +------------------------------------ + Calling a view named "bank/user" matches the above definition name. Inside the "body" attributes, \{1\} refers to the star's value which is "user" in that case. + + +** Multiple stars such as in '\*/\*' + + Let's now consider another case. As you can see, the sample below uses 2 stars '\*'. + +------------------------------------ + + + + + +------------------------------------ + + Calling a view named "/bank/customer/account" matches the above definition name. + Inside the 'body' attribute, \{1\} refers to the first star and \{2\} refers to the second one. + The "body" JSP name will be "customer-account.jsp". + + Here is another example which shows that you can use package-style definition names: ------------------------------------ @@ -38,10 +93,40 @@ Wildcard support ------------------------------------ -* {Using different pattern matching languages} - If you're using the <<>>, you must use a predix to specify - the pattern matching language you're using: either WILDCARD or REGEXP: +* Using prefixes + +** Enabling CompleteAutoloadTilesContainerFactory + + As a prerequisite for using prefixes, you need to have CompleteAutoloadTilesContainerFactory enabled. + + If you haven't enabled it yet, here is a quick checklist for you to use. + + The library tiles-extras is required. If you're using Maven, you need to add this dependency to you POM file: + + +------------------------------------ + + org.apache.tiles + tiles-extras + 2.2.2 + +------------------------------------ + + If you are using Spring, you should add the 'completeAutoload' attribute to your TilesConfigurer bean. + +------------------------------------ + + + +------------------------------------ + +** Using prefixes for wildcards and Regular Expressions + + + When using completeAutoload, you can use wildcard expressions and/or regexp. Each of them should be enabled using the dedicated prefix as follows. + +*** WILDCARD ------------------------------------ @@ -49,10 +134,17 @@ Wildcard support + + + + + ------------------------------------ And, if you want to use Regular Expressions: +*** REGEXP + ------------------------------------ @@ -60,6 +152,7 @@ Wildcard support ------------------------------------ +*** tiles:insertDefinition In both cases, if you insert a definition that matches the definition, for example: @@ -76,4 +169,4 @@ Wildcard support ------------------------------------- +------------------------------------ \ No newline at end of file From 07566821bc2945ff0b6ac2048686b8665826d599 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 2 Jan 2013 08:48:38 +0000 Subject: [PATCH 14/65] backport doc improvements from Michael Isvy `svn merge -c1427704 ^/tiles/framework/trunk` http://svn.apache.org/viewvc?view=revision&revision=1427704 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1427705 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/tutorial/advanced/wildcard.apt | 29 +++++++++------------ 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/site/apt/tutorial/advanced/wildcard.apt b/src/site/apt/tutorial/advanced/wildcard.apt index 383983104..6a716b0c2 100644 --- a/src/site/apt/tutorial/advanced/wildcard.apt +++ b/src/site/apt/tutorial/advanced/wildcard.apt @@ -109,24 +109,31 @@ Wildcard support org.apache.tiles tiles-extras - 2.2.2 + 3.0.1 ------------------------------------ If you are using Spring, you should add the 'completeAutoload' attribute to your TilesConfigurer bean. ------------------------------------ - + ------------------------------------ -** Using prefixes for wildcards and Regular Expressions +** Using prefixes + Here is an example of prefix using Regular Expressions: - When using completeAutoload, you can use wildcard expressions and/or regexp. Each of them should be enabled using the dedicated prefix as follows. +------------------------------------ + + + + + +------------------------------------ -*** WILDCARD + The below sample uses WILDCARD (this prefix is not needed when using wildcards solely, as shown in the 'Default Configuration' section). ------------------------------------ @@ -141,18 +148,8 @@ Wildcard support ------------------------------------ - And, if you want to use Regular Expressions: - -*** REGEXP ------------------------------------- - - - - - ------------------------------------- -*** tiles:insertDefinition +* tiles:insertDefinition In both cases, if you insert a definition that matches the definition, for example: From 828ae531fe24b447697626954dd556a8f44b278f Mon Sep 17 00:00:00 2001 From: Nicolas LE BAS Date: Tue, 5 Mar 2013 02:17:58 +0000 Subject: [PATCH 15/65] TILES-563: Typo on configuration tiles 3 page git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1452632 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/tutorial/configuration.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/apt/tutorial/configuration.apt b/src/site/apt/tutorial/configuration.apt index 05b9b745e..f72a61de0 100644 --- a/src/site/apt/tutorial/configuration.apt +++ b/src/site/apt/tutorial/configuration.apt @@ -37,7 +37,7 @@ Configuring Tiles in your web application ------------- org.apache.tiles -tiles-extras +tiles-extras ------------- If you're not using maven, just {{{/download.html}download}} tiles and copy all the jars From 8b053189df1c51269b2f8e0b64e9cd483592caf2 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 19 May 2013 16:33:46 +0000 Subject: [PATCH 16/65] have the constant public. there is no way currently to evaluate the fallback in the attribute, only to render it. git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1484307 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tiles/extras/renderer/OptionsRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java index 77aac7a8f..a6b7db623 100644 --- a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java +++ b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java @@ -70,7 +70,7 @@ */ public final class OptionsRenderer implements Renderer { - private static final Pattern OPTIONS_PATTERN + public static final Pattern OPTIONS_PATTERN = Pattern.compile(Pattern.quote("{options[") + "(.+)" + Pattern.quote("]}")); private static final Logger LOG = LoggerFactory.getLogger(OptionsRenderer.class); @@ -125,7 +125,7 @@ private boolean renderAttempt(final String template, final Request request) thro boolean result = false; if (!Cache.isTemplateMissing(template)) { try { - if (null != applicationContext.getResource(template)) { // can throw FileNotFoundException ! + if (null != applicationContext.getResource(template)) { renderer.render(template, request); // can throw FileNotFoundException ! result = true; Cache.setIfAbsentTemplateFound(template, true); From a2767c185886d85686080ac1a2c0bade85b85726 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 19 May 2013 16:46:51 +0000 Subject: [PATCH 17/65] back port from trunk r1368433 (TILES-557) and r1422025 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1484309 13f79535-47bb-0310-9956-ffa450edef68 --- tiles-extras/pom.xml | 6 ++ .../extras/renderer/OptionsRenderer.java | 88 ++++++++++--------- 2 files changed, 54 insertions(+), 40 deletions(-) diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 0f7058a3b..394f58373 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -110,6 +110,12 @@ tiles-compat ${project.version} + + + guava + com.google.guava + 12.0.1 + javax.servlet diff --git a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java index a6b7db623..09ff61e62 100644 --- a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java +++ b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java @@ -20,14 +20,15 @@ */ package org.apache.tiles.extras.renderer; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; import org.apache.tiles.Attribute; import org.apache.tiles.ListAttribute; import org.apache.tiles.access.TilesAccess; @@ -63,13 +64,21 @@ *

*

* Currently only supports one occurrance of such an "option" pattern in the attribute's value. - * + *

* Limitation: "looking" for templates is implemented using applicationContext.getResource(..) * therefore the option values in the options list need to be visible as applicationResources. - * + *

+ * The attribute found and rendered is cached so to improve performance on subsequent lookups. + * The default cache time-to-live is {@value #DEFAULT_CACHE_LIFE}, specified by {@link #DEFAULT_CACHE_LIFE}. + * It can be customised by setting the system property {@value #CACHE_LIFE_PROPERTY}, see {@link #CACHE_LIFE_PROPERTY}. + * Setting it to zero will disable the cache. */ public final class OptionsRenderer implements Renderer { + public static final String CACHE_LIFE_PROPERTY = OptionsRenderer.class.getName() + ".cache_ttl_ms"; + + public static final long DEFAULT_CACHE_LIFE = 1000 * 60 * 5; + public static final Pattern OPTIONS_PATTERN = Pattern.compile(Pattern.quote("{options[") + "(.+)" + Pattern.quote("]}")); @@ -114,7 +123,7 @@ public void render(final String path, final Request request) throws IOException if (done) { break; } } if (!done) { - throw new IOException("None of the options existed for " + path); + throw new IOException("None of the options existed for " + path); } } else { renderer.render(path, request); @@ -123,14 +132,21 @@ public void render(final String path, final Request request) throws IOException private boolean renderAttempt(final String template, final Request request) throws IOException { boolean result = false; - if (!Cache.isTemplateMissing(template)) { + if (Cache.attemptTemplate(template)) { try { if (null != applicationContext.getResource(template)) { - renderer.render(template, request); // can throw FileNotFoundException ! + renderer.render(template, request); result = true; - Cache.setIfAbsentTemplateFound(template, true); } - } catch (FileNotFoundException ex) { + } catch (IOException ex) { + if (ex.getMessage().contains(template)) { + // expected outcome. continue loop. + LOG.trace(ex.getMessage()); + } else { + // comes from an inner templateAttribute.render(..) so throw on + throw ex; + } + } catch (RuntimeException ex) { if (ex.getMessage().contains(template)) { // expected outcome. continue loop. LOG.trace(ex.getMessage()); @@ -138,49 +154,41 @@ private boolean renderAttempt(final String template, final Request request) thro // comes from an inner templateAttribute.render(..) so throw on throw ex; } - } catch (IOException ex) { //xxx ??? - throw ex; } - Cache.setIfAbsentTemplateFound(template, false); + Cache.update(template, result); } return result; } private static final class Cache { - /** It takes CACHE_LIFE milliseconds for any hot deployments to register. - */ - private static final ConcurrentMap TEMPLATE_EXISTS - = new ConcurrentHashMap(); - - private static volatile long cacheLastCleaned = System.currentTimeMillis(); + private static final long CACHE_LIFE = Long.getLong(CACHE_LIFE_PROPERTY, DEFAULT_CACHE_LIFE); - private static final String CACHE_LIFE_PROPERTY = Cache.class.getName() + ".ttl_ms"; + static { + LOG.info("cache_ttl_ms=" + CACHE_LIFE); + } - /** Cache TTL be customised by a system property like - * -Dorg.apache.tiles.extras.renderer.OptionsRenderer.Cache.ttl_ms=0 - * - * The default is 5 minutes. - * Setting it to zero disables all caching. + /** It takes CACHE_LIFE milliseconds for any hot deployments to register. */ - private static final long CACHE_LIFE = null != Long.getLong(CACHE_LIFE_PROPERTY) - ? Long.getLong(CACHE_LIFE_PROPERTY) - : 1000 * 60 * 5; - - static boolean isTemplateMissing(final String template) { - if (0 < CACHE_LIFE && System.currentTimeMillis() > cacheLastCleaned + CACHE_LIFE) { - cacheLastCleaned = System.currentTimeMillis(); - TEMPLATE_EXISTS.clear(); - return false; - } else { - return TEMPLATE_EXISTS.containsKey(template) && !TEMPLATE_EXISTS.get(template); - } + private static final ConcurrentMap TEMPLATE_EXISTS = CacheBuilder.newBuilder() + .expireAfterWrite(CACHE_LIFE, TimeUnit.MILLISECONDS) + .build( + new CacheLoader() { + @Override + public Boolean load(String key) { + throw new UnsupportedOperationException( + "illegal TEMPLATE_EXISTS.get(\"" + key + + "\") before TEMPLATE_EXISTS.containsKey(\"" + key + "\")"); + } + }) + .asMap(); + + static boolean attemptTemplate(final String template) { + return !TEMPLATE_EXISTS.containsKey(template) || TEMPLATE_EXISTS.get(template); } - static void setIfAbsentTemplateFound(final String template, final boolean found) { - if (0 < CACHE_LIFE && !TEMPLATE_EXISTS.containsKey(template)) { - TEMPLATE_EXISTS.putIfAbsent(template, found); - } + static void update(final String template, final boolean found) { + TEMPLATE_EXISTS.putIfAbsent(template, found); } private Cache() {} From 83476107ec74893abe8abf1b1a4237e92430fad5 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Mon, 27 May 2013 10:24:04 +0000 Subject: [PATCH 18/65] add link to Download page on each microsite git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1486560 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index ab8686e82..e10efa0c1 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -50,6 +50,9 @@ +

Date: Mon, 27 May 2013 11:16:52 +0000 Subject: [PATCH 19/65] compile against Java6 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1486577 13f79535-47bb-0310-9956-ffa450edef68 --- .../extras/renderer/OptionsRenderer.java | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java index 09ff61e62..bb80a17d8 100644 --- a/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java +++ b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java @@ -29,6 +29,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import org.apache.tiles.Attribute; import org.apache.tiles.ListAttribute; import org.apache.tiles.access.TilesAccess; @@ -164,24 +165,29 @@ private static final class Cache { private static final long CACHE_LIFE = Long.getLong(CACHE_LIFE_PROPERTY, DEFAULT_CACHE_LIFE); + /** It takes CACHE_LIFE milliseconds for any hot deployments to register. + */ + private static final ConcurrentMap TEMPLATE_EXISTS; + static { LOG.info("cache_ttl_ms=" + CACHE_LIFE); + + LoadingCache builder = CacheBuilder + .newBuilder() + .expireAfterWrite(CACHE_LIFE, TimeUnit.MILLISECONDS) + .build( + new CacheLoader() { + @Override + public Boolean load(String key) { + throw new UnsupportedOperationException( + "illegal TEMPLATE_EXISTS.get(\"" + key + + "\") before TEMPLATE_EXISTS.containsKey(\"" + key + "\")"); + } + }); + + TEMPLATE_EXISTS = builder.asMap(); } - /** It takes CACHE_LIFE milliseconds for any hot deployments to register. - */ - private static final ConcurrentMap TEMPLATE_EXISTS = CacheBuilder.newBuilder() - .expireAfterWrite(CACHE_LIFE, TimeUnit.MILLISECONDS) - .build( - new CacheLoader() { - @Override - public Boolean load(String key) { - throw new UnsupportedOperationException( - "illegal TEMPLATE_EXISTS.get(\"" + key - + "\") before TEMPLATE_EXISTS.containsKey(\"" + key + "\")"); - } - }) - .asMap(); static boolean attemptTemplate(final String template) { return !TEMPLATE_EXISTS.containsKey(template) || TEMPLATE_EXISTS.get(template); From 9ca0d6e222342f11f133c15f569d00fd76b2e413 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Mon, 28 Oct 2013 18:02:06 +0000 Subject: [PATCH 20/65] upgrade to tiles-master-5. upgrade to svnpubsub system using maven-scm-publish-plugin. update the release and building pages for devs (svnpubsub, and referencing existing apache docs). Update release documentation: build requires Java7, and build requires maven-3.0.5+ git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1536457 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 14 ++--- src/site/apt/dev/release.apt | 108 +++++++++++++++------------------ src/site/xdoc/dev/building.xml | 6 +- 3 files changed, 58 insertions(+), 70 deletions(-) diff --git a/pom.xml b/pom.xml index d996d1b87..2a0184afc 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ tiles-master org.apache.tiles - 4 + 5 @@ -71,7 +71,7 @@ apache-site - scp://people.apache.org/www/tiles.apache.org/framework + scm:svn:https://svn.apache.org/repos/asf/tiles/site/staging/framework @@ -292,11 +292,11 @@ - org.apache.maven.plugins - maven-release-plugin + org.apache.maven.plugins + maven-scm-publish-plugin + true - apache-release - deploy site-deploy + scm:svn:https://svn.apache.org/repos/asf/tiles/site/staging/framework @@ -312,7 +312,7 @@ target/osgi/MANIFEST.MF UTF-8 - 1.0.1 + 1.0.3 1.1.0 diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt index d99e3becb..374491e7b 100644 --- a/src/site/apt/dev/release.apt +++ b/src/site/apt/dev/release.apt @@ -25,15 +25,23 @@ Tiles Release Process Here you will find the steps to create releases for Tiles. + Apache's existing documentation should be read + + * {{{http://www.apache.org/dev/release-publishing}Publishing Releases}} + + * {{{http://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}} + + * {{{http://www.apache.org/dev/release}Releases Policy}} + Prerequisites To create a release you have to install: - * {{{http://java.sun.com/javase/6}Java 6.0}}. If you are using a newer - version of Java, it is suggested to <> - when calling Maven, so it points to an instance of Java 6.0; + * {{{http://www.oracle.com/technetwork/java/javase/overview/index.html}Java 7}}. If you are using a newer + version of Java <> + when calling Maven, so it points to an instance of Java 7; - * {{{http://maven.apache.org/}Maven 2.2 or 3}}; + * {{{http://maven.apache.org/}Maven 3.0.5+}}; * {{{http://www.gnupg.org/}GnuPG}}; @@ -84,43 +92,7 @@ ssh user@people.apache.org Your <<>> must be modified to allow deployment. - This is the minimal configuration, obviously if you already have a <<>> file, - you must edit it: - ---------------------------- - - - - apache-site - YOUR_APACHE_USERNAME - 664 - 775 - - - apache.snapshots.https - YOUR_APACHE_USERNAME - YOUR_APACHE_PASSWORD - - - apache.releases.https - YOUR_APACHE_USERNAME - YOUR_APACHE_PASSWORD - - - - - release - - YOUR_SECRET_PHRASE - - - - - ---------------------------- + See {{{http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env}Publishing Maven Artifacts – Setup your development environment}} Repeatable operations @@ -132,13 +104,14 @@ Repeatable operations you are preparing the release and type: ----------------------------------- +mvn clean mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD ----------------------------------- The plugin interactively will ask you the version to release, the Subversion tag to use and the next snapshot version. It is recommended to use the tag: <>. - + See also {{{http://www.apache.org/dev/publishing-maven-artifacts.html}the recommendations of the ASF}}. * Perform the Release @@ -148,17 +121,27 @@ mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD ----------------------------------- mvn release:perform ----------------------------------- - - It should compile and test everything, build and upload the artifacts and the website for the project. + + It should compile and test everything, build and upload the artifacts and the website for the project. + + <>: if upload of assemblies fails it can be done manually with + +----------------------------------- +cd target/checkout/assembly/target/assemblies/ +ssh user@people.apache.org mkdir /www/people.apache.org/builds/tiles/${version}/ +scp * user@people.apache.org:/www/people.apache.org/builds/tiles/${version}/ +----------------------------------- * Close the staging repository Login to {{{https://repository.apache.org} Nexus repository}} using your Apache LDAP credentials. Click on "Staging". Then click on "tiles" in the list of repositories. + In the panel below you should see an open repository that is linked to your username and ip. Right click on this repository and select "Close". This will close the repository from future deployments and make it available for others to view. If you are staging multiple releases together, skip this step until you have staged everything. + Enter the name and version of the artifact being released in the "Description" field and then click "Close". This will make it easier to identify it later. @@ -175,8 +158,8 @@ mvn release:perform * Verify the uploaded assemblies * go to the destination directory on people.apache.org (cd /www/people.apache.org/builds/tiles/${version}). - - * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1). + + * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1). * Release the JIRA version @@ -258,28 +241,29 @@ three binding +1s and more +1s than -1s. After a vote is finished, and it has been decided that is <>, there is the need of a post-vote process. -** Promote staged artifacts +** Promote maven staged artifacts - Once the release is deemed fit for public consumption it can be transfered to a production repository where it will be available to all users. + Once the release is deemed fit for public consumption it can be transfered to a + production repository where it will be available to all users. Login to {{{https://repository.apache.org}Nexus repository}} again. Click on "Staging" and then on the repository with id "tiles-staging". - Find your closed staging repository, right click on it and choose "Promote". - Select the "Releases" repository and click "Promote". + Find your closed staging repository, right click on it and choose "Release". Next click on "Repositories", select the "Releases" repository and validate that your artifacts exist as you expect them. -** Move assemblies +** Publish distribution artifacts - * Move assemblies to the Apache distribution mirrors: + * Move assemblies into the Apache {{{http://www.apache.org/dev/release#when-to-archive}dist}} repository: ------------------------------------------- -ssh user@people.apache.org - -cd /www/people.apache.org/builds/tiles/${version} -mkdir /www/www.apache.org/dist/tiles/v${version}/ -cp * /www/www.apache.org/dist/tiles/v${version}/ +svn co https://dist.apache.org/repos/dist/release/tiles tiles-dist-releases +mkdir tiles-dist-releases/v${version} +cd tiles-dist-releases/v${version} +scp user@people.apache.org:/www/people.apache.org/builds/tiles/${version}/* . +svn add . +svn ci ------------------------------------------- ** Update the site @@ -295,8 +279,12 @@ https://svn.apache.org/repos/asf/tiles/site/src/site/apt/download.apt Build and publish the site: -------------------------------------- -mvn site -mvn site:deploy +mvn clean site site:stage +mvn scm-publish:publish-scm +# check staging website at target/scmpublish-checkout/index.html +cd /publish/framework/ +svn merge ^/tiles/site/staging/framework . +svn ci -------------------------------------- ** Send announcement @@ -310,7 +298,7 @@ Subject: [ANNOUNCE] Tiles ${version} ${quality} released The Apache Tiles team is pleased to announce the release of Tiles ${version} ${quality}. -Tiles ${version} is available in a binary and a source distribution. +Available in binary and source distribution. http://tiles.apache.org/download.html diff --git a/src/site/xdoc/dev/building.xml b/src/site/xdoc/dev/building.xml index 7fb099a03..700ae4f1a 100644 --- a/src/site/xdoc/dev/building.xml +++ b/src/site/xdoc/dev/building.xml @@ -83,10 +83,10 @@

  • checkout the site from the source repository:

    svn co http://svn.apache.org/repos/asf/tiles/site/

  • go into the site directory and type:

    -

    mvn site

    • +

    mvn clean site site:stage

    You will find the generated distribution under - {tiles-site-dir}/target/site.

    + {tiles-site-dir}/target/staging.

    To build the framework website:

    @@ -95,7 +95,7 @@ distribution, or checkout the latest version:

    svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-parent/

  • go into the source directory and type:

    -

    mvn site site:stage

    • +

    mvn clean site site:stage

    You will find the generated website under:

      From b98027f37052fed1cfdbcd583e1adb3ba6cc0f85 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 3 Nov 2013 10:48:49 +0000 Subject: [PATCH 21/65] Use the new tiles-master-6 http://thread.gmane.org/gmane.comp.apache.tiles.devel/595 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1538333 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a0184afc..bd8d402ce 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ tiles-master org.apache.tiles - 5 + 6 From 816f7945df4a887e5a356c7057a445094ef14389 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 3 Nov 2013 11:18:22 +0000 Subject: [PATCH 22/65] [maven-release-plugin] prepare release tiles-parent-3.0.2 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1538337 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 08e10a740..8d924529e 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.2/assembly diff --git a/pom.xml b/pom.xml index bd8d402ce..9c2794c02 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2 + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2 + http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.2 diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 738a14af3..230415e43 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 67213a5e7..01ecc975b 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index ccf112d2c..64cda0595 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 0e0371d14..dd6cf04c8 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 394f58373..f0100c4e6 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index f4a00f0e5..46d6a7358 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 463c4ad7b..98a9c37e7 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 9bedf8630..89b0a7199 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index f52d395d8..d53a17023 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 2022bd3b9..1c2ea921c 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index cddb882b1..849f8c2cd 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 29c84b66c..261e984de 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index 20439095c..23627241b 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index 2fe1dbfd9..3f4f5c3ce 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 org.apache.tiles tiles-test-common - 3.0.2-SNAPSHOT + 3.0.2 Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index de05a0550..0b7df84a5 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index 9e281d96c..e439d1379 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index ace0eba3c..9f0bc0c93 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.2-SNAPSHOT + 3.0.2 4.0.0 From abc80cc599b4ef47202a6ee00c370daa02a42a46 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 3 Nov 2013 11:19:58 +0000 Subject: [PATCH 23/65] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1538339 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 8d924529e..f09b4cfde 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.2/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly diff --git a/pom.xml b/pom.xml index 9c2794c02..73ce9253d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2 - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.2 - http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.2 + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 230415e43..1658dfff4 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 01ecc975b..6222c75aa 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index 64cda0595..3993dbb90 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index dd6cf04c8..022ff7d20 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index f0100c4e6..1ae282718 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index 46d6a7358..6ad512855 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 98a9c37e7..6b6f5eee0 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 89b0a7199..874e942a2 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index d53a17023..8f1080cd5 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 1c2ea921c..6981f8a23 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 849f8c2cd..30bf662c5 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 261e984de..18f473a6f 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index 23627241b..aa1d99e08 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index 3f4f5c3ce..a41b0a344 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT org.apache.tiles tiles-test-common - 3.0.2 + 3.0.3-SNAPSHOT Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index 0b7df84a5..1b5b558a7 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index e439d1379..38c01090e 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 9f0bc0c93..7e2c951f5 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.2 + 3.0.3-SNAPSHOT 4.0.0 From d02515da434e9179a8b7c97d23891b6a959d533f Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 3 Nov 2013 15:47:10 +0000 Subject: [PATCH 24/65] lessons learnt from the tiles-3.0.2 release git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1538384 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 2 +- src/site/apt/dev/release.apt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index f09b4cfde..d0aa00d23 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.wagon wagon-ssh - 1.0 + 2.5 diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt index 374491e7b..9f0840afa 100644 --- a/src/site/apt/dev/release.apt +++ b/src/site/apt/dev/release.apt @@ -119,7 +119,7 @@ mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD To perform the release, i.e. creating and deploying Maven artifacts, use: ----------------------------------- -mvn release:perform +mvn release:perform -Duser.name=YOUR_PEOPLE_APACHE_SSH_USER ----------------------------------- It should compile and test everything, build and upload the artifacts and the website for the project. From 276a7258b1136138f1ab14b14ce235d6f0752d56 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 6 Nov 2013 16:24:13 +0000 Subject: [PATCH 25/65] =?UTF-8?q?TILES-573=20=E2=80=93=20Tiles.xml=20defin?= =?UTF-8?q?itions=20not=20reloaded=20when=20using=20expressions=20Contribu?= =?UTF-8?q?tion=20from=20Eric=20B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1539385 13f79535-47bb-0310-9956-ffa450edef68 --- .../dao/CachingLocaleUrlDefinitionDAO.java | 4 +- .../AbstractPatternDefinitionResolver.java | 13 +++ .../pattern/PatternDefinitionResolver.java | 8 ++ ...AbstractPatternDefinitionResolverTest.java | 100 ++++++++++-------- 4 files changed, 78 insertions(+), 47 deletions(-) diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java index 542d8d747..cee95a3b9 100644 --- a/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java +++ b/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java @@ -166,10 +166,10 @@ protected Definition getDefinitionFromResolver(String name, * @return The loaded definitions. * @since 2.1.0 */ - protected synchronized Map checkAndloadDefinitions( - Locale customizationKey) { + protected synchronized Map checkAndloadDefinitions(Locale customizationKey) { if (checkRefresh && refreshRequired()) { locale2definitionMap.clear(); + definitionResolver.clearPatternPaths(customizationKey); } loadDefinitions(customizationKey); return locale2definitionMap.get(customizationKey); diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java index 65ff73d0f..50bc8f74b 100644 --- a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java +++ b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java @@ -106,4 +106,17 @@ private Definition searchAndResolveDefinition( return d; } + + + /** + * Used to clear all entries in the localePatternPaths for a specific locale. Necessary when reloading definition + * files to ensure that the list is cleared first + * + * @param customizationKey + */ + @Override + public void clearPatternPaths(T customizationKey) { + if (localePatternPaths.get(customizationKey) != null) + localePatternPaths.get(customizationKey).clear(); + } } diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java index 539f8ddea..2cf3d4b9c 100644 --- a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java +++ b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java @@ -57,4 +57,12 @@ Map storeDefinitionPatterns(Map localeDe * @since 2.2.0 */ Definition resolveDefinition(String name, T customizationKey); + + /** + * Used to clear all entries in the localePatternPaths for a specific locale. Necessary when reloading definition + * files to ensure that the list is cleared first + * + * @param customizationKey + */ + public void clearPatternPaths(T customizationKey); } diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java index 10a39a802..a564e375a 100644 --- a/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java +++ b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java @@ -40,60 +40,70 @@ */ public class AbstractPatternDefinitionResolverTest { + private DefinitionPatternMatcher firstMatcher; + private DefinitionPatternMatcher thirdMatcher; + + private final PatternDefinitionResolver resolver = new AbstractPatternDefinitionResolver() { + @Override + protected Map addDefinitionsAsPatternMatchers( + List matchers, + Map defsMap) { + + if (defsMap.containsKey("first")) { + matchers.add(firstMatcher); + } + if (defsMap.containsKey("third")) { + matchers.add(thirdMatcher); + } + Map retValue = new HashMap(defsMap); + retValue.remove("first"); + retValue.remove("third"); + return retValue; + } + }; + /** * Test method for * {@link BasicPatternDefinitionResolver#resolveDefinition(String, Object)}. */ @Test public void testResolveDefinition() { - final DefinitionPatternMatcher firstMatcher = createMock(DefinitionPatternMatcher.class); - final DefinitionPatternMatcher thirdMatcher = createMock(DefinitionPatternMatcher.class); - - Definition firstDefinition = new Definition("first", (Attribute) null, - null); - Definition secondDefinition = new Definition("second", - (Attribute) null, null); - Definition thirdDefinition = new Definition("third", (Attribute) null, - null); - - Definition firstTransformedDefinition = new Definition( - "firstTransformed", (Attribute) null, null); - Definition thirdTransformedDefinition = new Definition( - "thirdTransformed", (Attribute) null, null); - - expect(firstMatcher.createDefinition("firstTransformed")).andReturn( - firstTransformedDefinition); - expect(firstMatcher.createDefinition("secondTransformed")).andReturn( - null); - expect(firstMatcher.createDefinition("thirdTransformed")).andReturn( - null); - expect(thirdMatcher.createDefinition("thirdTransformed")).andReturn( - thirdTransformedDefinition).times(2); - expect(thirdMatcher.createDefinition("firstTransformed")).andReturn( - null); - expect(thirdMatcher.createDefinition("secondTransformed")).andReturn( - null).times(2); + testResolveDefinitionImpl(); + } + + /** + * Test method for + * {@link BasicPatternDefinitionResolver#clearPatternPaths(Object)}. + */ + @Test + public void testClearPatternPaths() { + testResolveDefinitionImpl(); + resolver.clearPatternPaths(1); + resolver.clearPatternPaths(2); + testResolveDefinitionImpl(); + } + + private void testResolveDefinitionImpl() { + + firstMatcher = createMock(DefinitionPatternMatcher.class); + thirdMatcher = createMock(DefinitionPatternMatcher.class); + + Definition firstDefinition = new Definition("first", (Attribute) null, null); + Definition secondDefinition = new Definition("second", (Attribute) null, null); + Definition thirdDefinition = new Definition("third", (Attribute) null, null); + + Definition firstTransformedDefinition = new Definition("firstTransformed", (Attribute) null, null); + Definition thirdTransformedDefinition = new Definition("thirdTransformed", (Attribute) null, null); + + expect(firstMatcher.createDefinition("firstTransformed")).andReturn(firstTransformedDefinition); + expect(firstMatcher.createDefinition("secondTransformed")).andReturn(null); + expect(firstMatcher.createDefinition("thirdTransformed")).andReturn(null); + expect(thirdMatcher.createDefinition("thirdTransformed")).andReturn(thirdTransformedDefinition).times(2); + expect(thirdMatcher.createDefinition("firstTransformed")).andReturn(null); + expect(thirdMatcher.createDefinition("secondTransformed")).andReturn(null).times(2); replay(firstMatcher, thirdMatcher); - PatternDefinitionResolver resolver = new AbstractPatternDefinitionResolver() { - - @Override - protected Map addDefinitionsAsPatternMatchers( - List matchers, - Map defsMap) { - if (defsMap.containsKey("first")) { - matchers.add(firstMatcher); - } - if (defsMap.containsKey("third")) { - matchers.add(thirdMatcher); - } - Map retValue = new HashMap(defsMap); - retValue.remove("first"); - retValue.remove("third"); - return retValue; - } - }; Map localeDefsMap = new LinkedHashMap(); localeDefsMap.put("first", firstDefinition); localeDefsMap.put("second", secondDefinition); From 9477bdc0ba44ef1f37506826c68fc9efa69369b4 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 6 Nov 2013 22:16:12 +0000 Subject: [PATCH 26/65] [maven-release-plugin] prepare release tiles-parent-3.0.3 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1539477 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index d0aa00d23..eb248d311 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.3/assembly diff --git a/pom.xml b/pom.xml index 73ce9253d..de02cfcab 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X - http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3 + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3 + http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.3 diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 1658dfff4..950884c82 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 6222c75aa..98e124bbb 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index 3993dbb90..10779dd5f 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 022ff7d20..03972fdcd 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 1ae282718..32cd4df15 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index 6ad512855..c36d8bff5 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 6b6f5eee0..92b1e3d4d 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index 874e942a2..b8b381877 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index 8f1080cd5..9a38d797f 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 6981f8a23..21662cfbc 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 30bf662c5..5f7c4638d 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 18f473a6f..1021b30de 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index aa1d99e08..31c4178bb 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index a41b0a344..980c0741c 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 org.apache.tiles tiles-test-common - 3.0.3-SNAPSHOT + 3.0.3 Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index 1b5b558a7..e13083515 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index 38c01090e..986ece31c 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 7e2c951f5..977ca8945 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.3-SNAPSHOT + 3.0.3 4.0.0 From 5192836f2570cbd36fb83362a995fa3e5b3759b9 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 6 Nov 2013 22:17:06 +0000 Subject: [PATCH 27/65] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1539480 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 8 ++++---- pom.xml | 8 ++++---- tiles-api/pom.xml | 2 +- tiles-compat/pom.xml | 2 +- tiles-core/pom.xml | 2 +- tiles-el/pom.xml | 2 +- tiles-extras/pom.xml | 2 +- tiles-freemarker/pom.xml | 2 +- tiles-jsp/pom.xml | 2 +- tiles-mvel/pom.xml | 2 +- tiles-ognl/pom.xml | 2 +- tiles-servlet/pom.xml | 2 +- tiles-template/pom.xml | 2 +- tiles-test-pom/pom.xml | 2 +- tiles-test-pom/tiles-test-alt/pom.xml | 2 +- tiles-test-pom/tiles-test-common/pom.xml | 4 ++-- tiles-test-pom/tiles-test-db/pom.xml | 2 +- tiles-test-pom/tiles-test/pom.xml | 2 +- tiles-velocity/pom.xml | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index eb248d311..229cd7d2c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -30,13 +30,13 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3/assembly - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3/assembly - http://svn.apache.org/viewcvs.cgi/tiles/framework/tags/tiles-parent-3.0.3/assembly + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X/assembly + http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_3_0_X/assembly diff --git a/pom.xml b/pom.xml index de02cfcab..9ef6383a2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,15 +33,15 @@ 4.0.0 org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT pom Tiles 3 Tiles 3: A framework for page composition. http://tiles.apache.org/framework/ - scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3 - scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-3.0.3 - http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-3.0.3 + scm:svn:http://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + scm:svn:https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X + http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml index 950884c82..a3cc69ac5 100644 --- a/tiles-api/pom.xml +++ b/tiles-api/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-compat/pom.xml b/tiles-compat/pom.xml index 98e124bbb..d101b4195 100644 --- a/tiles-compat/pom.xml +++ b/tiles-compat/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml index 10779dd5f..efec95ff2 100644 --- a/tiles-core/pom.xml +++ b/tiles-core/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-el/pom.xml b/tiles-el/pom.xml index 03972fdcd..41aafe700 100644 --- a/tiles-el/pom.xml +++ b/tiles-el/pom.xml @@ -19,7 +19,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml index 32cd4df15..2aa901e41 100644 --- a/tiles-extras/pom.xml +++ b/tiles-extras/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml index c36d8bff5..04d107816 100644 --- a/tiles-freemarker/pom.xml +++ b/tiles-freemarker/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml index 92b1e3d4d..d4b51fccb 100644 --- a/tiles-jsp/pom.xml +++ b/tiles-jsp/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml index b8b381877..c48a22e04 100644 --- a/tiles-mvel/pom.xml +++ b/tiles-mvel/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-ognl/pom.xml b/tiles-ognl/pom.xml index 9a38d797f..4eb0eccd9 100644 --- a/tiles-ognl/pom.xml +++ b/tiles-ognl/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-servlet/pom.xml b/tiles-servlet/pom.xml index 21662cfbc..1653d92fa 100644 --- a/tiles-servlet/pom.xml +++ b/tiles-servlet/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-parent - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml index 5f7c4638d..a7a983c58 100644 --- a/tiles-template/pom.xml +++ b/tiles-template/pom.xml @@ -30,7 +30,7 @@ tiles-parent org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT diff --git a/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml index 1021b30de..08e82a7d5 100644 --- a/tiles-test-pom/pom.xml +++ b/tiles-test-pom/pom.xml @@ -26,7 +26,7 @@ tiles-parent org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT tiles-test-pom pom diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml index 31c4178bb..4ac045068 100644 --- a/tiles-test-pom/tiles-test-alt/pom.xml +++ b/tiles-test-pom/tiles-test-alt/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT tiles-test-alt Tiles - Test webapp alternate configuration diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml index 980c0741c..e7e5711cd 100644 --- a/tiles-test-pom/tiles-test-common/pom.xml +++ b/tiles-test-pom/tiles-test-common/pom.xml @@ -26,11 +26,11 @@ tiles-test-pom org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT org.apache.tiles tiles-test-common - 3.0.3 + 3.0.4-SNAPSHOT Tiles - Test webapp common classes Common classes between modules of the test webapp. diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml index e13083515..860dcbc29 100644 --- a/tiles-test-pom/tiles-test-db/pom.xml +++ b/tiles-test-pom/tiles-test-db/pom.xml @@ -26,7 +26,7 @@ tiles-test-pom org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT tiles-test-db Tiles - Test webapp database configuration diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml index 986ece31c..56e138e50 100644 --- a/tiles-test-pom/tiles-test/pom.xml +++ b/tiles-test-pom/tiles-test/pom.xml @@ -26,7 +26,7 @@ org.apache.tiles tiles-test-pom - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml index 977ca8945..dff26b423 100644 --- a/tiles-velocity/pom.xml +++ b/tiles-velocity/pom.xml @@ -25,7 +25,7 @@ tiles-parent org.apache.tiles - 3.0.3 + 3.0.4-SNAPSHOT 4.0.0 From d391ba1e34203be0990f93ad73fafa57c2e48f09 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Thu, 7 Nov 2013 22:09:46 +0000 Subject: [PATCH 28/65] fix documentation after feedback from Emi Lu. Reference: http://article.gmane.org/gmane.comp.apache.tiles.user/661 git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1539840 13f79535-47bb-0310-9956-ffa450edef68 --- .../apt/tutorial/advanced/list-attributes.apt | 4 ++-- .../apt/tutorial/integration/frameworks.apt | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/site/apt/tutorial/advanced/list-attributes.apt b/src/site/apt/tutorial/advanced/list-attributes.apt index 588d8b888..a6a58e83f 100644 --- a/src/site/apt/tutorial/advanced/list-attributes.apt +++ b/src/site/apt/tutorial/advanced/list-attributes.apt @@ -48,8 +48,9 @@ List Attributes --------------------------------------- <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles-extras" prefix="tilesx" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> - +
      @@ -93,4 +94,3 @@ List Attributes * /tiles/credits.jsp * /tiles/greetings.jsp - \ No newline at end of file diff --git a/src/site/apt/tutorial/integration/frameworks.apt b/src/site/apt/tutorial/integration/frameworks.apt index e64ec44e0..60867a0ef 100644 --- a/src/site/apt/tutorial/integration/frameworks.apt +++ b/src/site/apt/tutorial/integration/frameworks.apt @@ -25,17 +25,19 @@ Integration with other web Frameworks Tiles can be integrated with other web frameworks. Usually this kind of integration is made through extensions/plugins to Tiles. - + * {{{http://struts.apache.org/1.x/index.html}Struts 1}}: Currently under development. A Struts 1 plugin is available in the SVN trunk, that presumably will be released along with Struts 1.4. - - * {{{http://struts.apache.org/2.x/docs/tiles-plugin.html}Struts 2}}: at the time of this + + * {{{http://struts.apache.org/development/2.x/struts2-plugins/struts2-tiles-plugin/apidocs/index.html}Struts 2}}: at the time of this writing, the Struts 2 Tiles plugin still uses Tiles version 2. - - * {{{http://static.springsource.org/spring/docs/current/spring-framework-reference/html/view.html#view-tiles}Spring MVC}}: - At the time of this writing, Spring uses Tiles version 2. - - * {{{http://shale.apache.org/shale-tiles/index.html}Shale}}: An integration - layer is provided, but it needs to be updated to the latest released version - of Tiles. + + * {{{http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/view.html#view-tiles}Spring MVC}}: + Spring-3.2 can integration up to Tiles-2 and Tiles-3. + + + + For a closer look at custom integrations the + {{{https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3}spring code}}: + forms a good example. From b347a93487bf8ece569f68c4f70db18fec6bdeef Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Thu, 7 Nov 2013 22:11:13 +0000 Subject: [PATCH 29/65] -Duser.name needs to be defined inside the deploy goal too git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1539841 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/dev/release.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt index 9f0840afa..bd22d74d7 100644 --- a/src/site/apt/dev/release.apt +++ b/src/site/apt/dev/release.apt @@ -119,7 +119,7 @@ mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD To perform the release, i.e. creating and deploying Maven artifacts, use: ----------------------------------- -mvn release:perform -Duser.name=YOUR_PEOPLE_APACHE_SSH_USER +mvn release:perform -Duser.name=YOUR_PEOPLE_APACHE_SSH_USER -Darguments="-Duser.name=YOUR_PEOPLE_APACHE_SSH_USER" ----------------------------------- It should compile and test everything, build and upload the artifacts and the website for the project. From b19a0eb2e0b3e53d5fd0df77d22fc376d26963cc Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Thu, 7 Nov 2013 22:11:58 +0000 Subject: [PATCH 30/65] add mustache to the list of templating languages supported git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1539842 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/tutorial/integration/view.apt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/site/apt/tutorial/integration/view.apt b/src/site/apt/tutorial/integration/view.apt index 170015b50..3a02f867d 100644 --- a/src/site/apt/tutorial/integration/view.apt +++ b/src/site/apt/tutorial/integration/view.apt @@ -29,3 +29,5 @@ Integration with other View Technologies * {{{./freemarker.html}FreeMarker}}. * {{{./velocity.html}Velocity}}. + + * Mustache. From fea6efc8f9bcdb788e02a5cd254db3492f732374 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 13 Nov 2013 11:52:29 +0000 Subject: [PATCH 31/65] new website style, and update after tiles-3.0.3 release. proper trademark and logo attribute. references: - http://thread.gmane.org/gmane.comp.apache.tiles.devel/602 - http://svn.apache.org/viewvc?view=revision&revision=1539491 - http://thread.gmane.org/gmane.comp.apache.tiles.devel/599 - http://www.apache.org/foundation/marks/pmcs#graphics git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1541483 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/site/site.xml | 54 +++++++++++++++-- src/site/site.xml | 65 ++++++++++++++------- tiles-api/src/site/site.xml | 53 +++++++++++++++-- tiles-compat/src/site/site.xml | 53 +++++++++++++++-- tiles-core/src/site/site.xml | 53 +++++++++++++++-- tiles-el/src/site/site.xml | 53 +++++++++++++++-- tiles-extras/src/site/site.xml | 53 +++++++++++++++-- tiles-freemarker/src/site/site.xml | 53 +++++++++++++++-- tiles-jsp/src/site/site.xml | 53 +++++++++++++++-- tiles-mvel/src/site/site.xml | 53 +++++++++++++++-- tiles-ognl/src/site/site.xml | 53 +++++++++++++++-- tiles-servlet/src/site/site.xml | 53 +++++++++++++++-- tiles-template/src/site/site.xml | 53 +++++++++++++++-- tiles-test-pom/src/site/site.xml | 53 +++++++++++++++-- tiles-test-pom/tiles-test/src/site/site.xml | 53 +++++++++++++++-- tiles-velocity/src/site/site.xml | 53 +++++++++++++++-- 16 files changed, 780 insertions(+), 81 deletions(-) diff --git a/assembly/src/site/site.xml b/assembly/src/site/site.xml index f7e677d03..f01aa9b0c 100644 --- a/assembly/src/site/site.xml +++ b/assembly/src/site/site.xml @@ -22,19 +22,65 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + ${modules} ${reports} + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/src/site/site.xml b/src/site/site.xml index e10efa0c1..24535e8f3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,42 +22,62 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + - Apache Software Foundation - http://www.apache.org/images/asf-logo.gif - http://www.apache.org - - Apache Tiles™ http://tiles.apache.org/images/logo.png http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org - - - - - - + name="Welcome" + href="/index.html"/> + + + name="Request 1.0.x" + href="/tiles-request/index.html"/> + href="/framework/security/index.html"/> - + + - @@ -182,5 +199,11 @@ +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-api/src/site/site.xml b/tiles-api/src/site/site.xml index 34d95ef19..a138604b6 100644 --- a/tiles-api/src/site/site.xml +++ b/tiles-api/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-compat/src/site/site.xml b/tiles-compat/src/site/site.xml index e2c7a3d18..e9360b732 100644 --- a/tiles-compat/src/site/site.xml +++ b/tiles-compat/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-core/src/site/site.xml b/tiles-core/src/site/site.xml index 7f5d6c626..a2c062f96 100644 --- a/tiles-core/src/site/site.xml +++ b/tiles-core/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-el/src/site/site.xml b/tiles-el/src/site/site.xml index 6a9ce8c8f..f25c90469 100644 --- a/tiles-el/src/site/site.xml +++ b/tiles-el/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-extras/src/site/site.xml b/tiles-extras/src/site/site.xml index 6b8e5780f..257f3a025 100644 --- a/tiles-extras/src/site/site.xml +++ b/tiles-extras/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-freemarker/src/site/site.xml b/tiles-freemarker/src/site/site.xml index ba0172f60..5195919e0 100644 --- a/tiles-freemarker/src/site/site.xml +++ b/tiles-freemarker/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-jsp/src/site/site.xml b/tiles-jsp/src/site/site.xml index e8241547e..f5969c686 100644 --- a/tiles-jsp/src/site/site.xml +++ b/tiles-jsp/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-mvel/src/site/site.xml b/tiles-mvel/src/site/site.xml index df9627ddb..bf8078276 100644 --- a/tiles-mvel/src/site/site.xml +++ b/tiles-mvel/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-ognl/src/site/site.xml b/tiles-ognl/src/site/site.xml index dae4c3f97..21632cf1c 100644 --- a/tiles-ognl/src/site/site.xml +++ b/tiles-ognl/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-servlet/src/site/site.xml b/tiles-servlet/src/site/site.xml index 3645b307d..5b7e95919 100644 --- a/tiles-servlet/src/site/site.xml +++ b/tiles-servlet/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-template/src/site/site.xml b/tiles-template/src/site/site.xml index 5f6363019..2659e3b1d 100644 --- a/tiles-template/src/site/site.xml +++ b/tiles-template/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-test-pom/src/site/site.xml b/tiles-test-pom/src/site/site.xml index ac9f5cc5e..01d63bcae 100644 --- a/tiles-test-pom/src/site/site.xml +++ b/tiles-test-pom/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-test-pom/tiles-test/src/site/site.xml b/tiles-test-pom/tiles-test/src/site/site.xml index d78cbc19a..4a1573eec 100644 --- a/tiles-test-pom/tiles-test/src/site/site.xml +++ b/tiles-test-pom/tiles-test/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      diff --git a/tiles-velocity/src/site/site.xml b/tiles-velocity/src/site/site.xml index 60c147508..8ff8ae057 100644 --- a/tiles-velocity/src/site/site.xml +++ b/tiles-velocity/src/site/site.xml @@ -22,19 +22,64 @@ */ --> + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + true + false + true + + apache/tiles + right + darkblue + + + + + Apache Tiles™ + http://tiles.apache.org/images/logo.png + http://tiles.apache.org + + + Apache Software Foundation + http://struts.apache.org/images/asf-logo.gif + http://www.apache.org + + name="Welcome" + href="/index.html"/> + name="Tiles 3.0.x" + href="/framework/index.html"/> + + + + +
      +
      + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. +
      +
      From 20c7ff4c990a81347e7ca2f589cace836d5cce25 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 13 Nov 2013 16:14:06 +0000 Subject: [PATCH 32/65] redo r1541483 fixing links in site.xml ( http://jira.codehaus.org/browse/MSITE-159 ) git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1541580 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/site/site.xml | 10 +++++----- src/site/site.xml | 18 +++++++++--------- tiles-api/src/site/site.xml | 10 +++++----- tiles-compat/src/site/site.xml | 10 +++++----- tiles-core/src/site/site.xml | 10 +++++----- tiles-el/src/site/site.xml | 10 +++++----- tiles-extras/src/site/site.xml | 10 +++++----- tiles-freemarker/src/site/site.xml | 10 +++++----- tiles-jsp/src/site/site.xml | 10 +++++----- tiles-mvel/src/site/site.xml | 10 +++++----- tiles-ognl/src/site/site.xml | 10 +++++----- tiles-servlet/src/site/site.xml | 10 +++++----- tiles-template/src/site/site.xml | 10 +++++----- tiles-test-pom/src/site/site.xml | 10 +++++----- tiles-test-pom/tiles-test/src/site/site.xml | 10 +++++----- tiles-velocity/src/site/site.xml | 10 +++++----- 16 files changed, 84 insertions(+), 84 deletions(-) diff --git a/assembly/src/site/site.xml b/assembly/src/site/site.xml index f01aa9b0c..de31de869 100644 --- a/assembly/src/site/site.xml +++ b/assembly/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/src/site/site.xml b/src/site/site.xml index 24535e8f3..d0b5222c6 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -54,19 +54,19 @@ + href="../index.html"/> + href="index.html"/> + href="../tiles-autotag/index.html"/> + href="../tiles-request/index.html"/> + href="security/index.html"/> @@ -184,16 +184,16 @@ + href="dev/building.html"/> + href="dev/snapshots.html"/> + href="dev/release.html"/> + href="selenium.html"/> diff --git a/tiles-api/src/site/site.xml b/tiles-api/src/site/site.xml index a138604b6..beaec78a7 100644 --- a/tiles-api/src/site/site.xml +++ b/tiles-api/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-compat/src/site/site.xml b/tiles-compat/src/site/site.xml index e9360b732..7c9841a74 100644 --- a/tiles-compat/src/site/site.xml +++ b/tiles-compat/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-core/src/site/site.xml b/tiles-core/src/site/site.xml index a2c062f96..6cf638680 100644 --- a/tiles-core/src/site/site.xml +++ b/tiles-core/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-el/src/site/site.xml b/tiles-el/src/site/site.xml index f25c90469..ec3b4ec03 100644 --- a/tiles-el/src/site/site.xml +++ b/tiles-el/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-extras/src/site/site.xml b/tiles-extras/src/site/site.xml index 257f3a025..475789550 100644 --- a/tiles-extras/src/site/site.xml +++ b/tiles-extras/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-freemarker/src/site/site.xml b/tiles-freemarker/src/site/site.xml index 5195919e0..2bedf4e47 100644 --- a/tiles-freemarker/src/site/site.xml +++ b/tiles-freemarker/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-jsp/src/site/site.xml b/tiles-jsp/src/site/site.xml index f5969c686..cf33f2096 100644 --- a/tiles-jsp/src/site/site.xml +++ b/tiles-jsp/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-mvel/src/site/site.xml b/tiles-mvel/src/site/site.xml index bf8078276..06e8e095d 100644 --- a/tiles-mvel/src/site/site.xml +++ b/tiles-mvel/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-ognl/src/site/site.xml b/tiles-ognl/src/site/site.xml index 21632cf1c..df764fb47 100644 --- a/tiles-ognl/src/site/site.xml +++ b/tiles-ognl/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-servlet/src/site/site.xml b/tiles-servlet/src/site/site.xml index 5b7e95919..43730c51c 100644 --- a/tiles-servlet/src/site/site.xml +++ b/tiles-servlet/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-template/src/site/site.xml b/tiles-template/src/site/site.xml index 2659e3b1d..b4d2510aa 100644 --- a/tiles-template/src/site/site.xml +++ b/tiles-template/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-test-pom/src/site/site.xml b/tiles-test-pom/src/site/site.xml index 01d63bcae..6e87b5faa 100644 --- a/tiles-test-pom/src/site/site.xml +++ b/tiles-test-pom/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-test-pom/tiles-test/src/site/site.xml b/tiles-test-pom/tiles-test/src/site/site.xml index 4a1573eec..c298bdfc6 100644 --- a/tiles-test-pom/tiles-test/src/site/site.xml +++ b/tiles-test-pom/tiles-test/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> diff --git a/tiles-velocity/src/site/site.xml b/tiles-velocity/src/site/site.xml index 8ff8ae057..23a1b4659 100644 --- a/tiles-velocity/src/site/site.xml +++ b/tiles-velocity/src/site/site.xml @@ -54,19 +54,19 @@ + href="../../index.html"/> + href="../../framework/index.html"/> + href="../../tiles-autotag/index.html"/> + href="../../tiles-request/index.html"/> + href="../security/index.html"/> From ac67bbfd5148c20cf9c060da24cbeb42e83ee317 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Mon, 18 Nov 2013 20:10:47 +0000 Subject: [PATCH 33/65] =?UTF-8?q?TILES-574=20=E2=80=93=20Tiles=20expressio?= =?UTF-8?q?ns=20do=20not=20work=20after=20wildcard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1543135 13f79535-47bb-0310-9956-ffa450edef68 --- .../tiles/definition/pattern/PatternUtil.java | 16 +++-- .../definition/pattern/PatternUtilTest.java | 70 ++++++++++++++++--- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java index 569416e72..edc82b957 100644 --- a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java +++ b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java @@ -22,6 +22,7 @@ package org.apache.tiles.definition.pattern; import java.text.MessageFormat; +import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -209,16 +210,21 @@ private static Attribute replaceVarsInListAttribute(ListAttribute listAttr, */ private static String replace(String st, Object... vars) { if (st != null && st.indexOf('{') >= 0) { - // remember the invalid "{...}" occurrences - Matcher m = INVALID_FORMAT_ELEMENT.matcher(st); + // replace them with markers - st = INVALID_FORMAT_ELEMENT.matcher(st).replaceAll("INVALID_FORMAT_ELEMENT"); + List originals = new ArrayList(); + for(Matcher m = INVALID_FORMAT_ELEMENT.matcher(st); m.find() ; m = INVALID_FORMAT_ELEMENT.matcher(st)) { + originals.add(m.group()); + st = m.replaceFirst("INVALID_FORMAT_ELEMENT"); + } + // do the MessageFormat replacement (escaping quote characters) st = new MessageFormat(st.replaceAll("'", "'''"), ROOT_LOCALE) .format(vars, new StringBuffer(), null).toString(); + // return the markers to their original invalid occurrences - while (m.find()) { - st = st.replace("INVALID_FORMAT_ELEMENT", m.group()); + for (String original : originals) { + st = st.replaceFirst("INVALID_FORMAT_ELEMENT", original); } } return st; diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java index 66218db00..ddbfacfd1 100644 --- a/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java +++ b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java @@ -185,15 +185,69 @@ public void testCreateExtractedMap() { * See TILES-502 */ @Test - public void testReplacePlaceholdersEL() { + public void testReplacePlaceholdersEL_0() { Map attributes = new HashMap(); - attributes.put("something", new Attribute("some-{1}-${requestScope.someVariable}.jsp")); - Definition definition = new Definition("definitionName", new Attribute( - "template"), attributes); - Definition nudef = PatternUtil.replacePlaceholders(definition, "nudef", - "value0", "value1", "value2", "value3"); + Attribute attribute = new Attribute("some-{1}-${requestScope.someVariable}.jsp"); + attribute.setExpressionObject(new Expression((String)attribute.getValue())); + attributes.put("something", attribute); + Definition definition = new Definition("definitionName", new Attribute("template"), attributes); + Definition nudef = PatternUtil.replacePlaceholders(definition, "nudef", "value0", "value1", "value2", "value3"); + assertEquals("nudef", nudef.getName()); + + assertEquals( + "some-value1-${requestScope.someVariable}.jsp", + nudef.getAttribute("something").getValue()); + + assertEquals( + "some-value1-${requestScope.someVariable}.jsp", + nudef.getAttribute("something").getExpressionObject().getExpression()); + } + + /** + * Test method for + * {@link PatternUtil#replacePlaceholders(Definition, String, Object[])}. + * See TILES-574 + */ + @Test + public void testReplacePlaceholdersEL_1() { + Map attributes = new HashMap(); + Attribute attribute = new Attribute("some-{1}-${requestScope.someVariable}-other-{2}.jsp"); + attribute.setExpressionObject(new Expression((String)attribute.getValue())); + attributes.put("something", attribute); + Definition definition = new Definition("definitionName", new Attribute("template"), attributes); + Definition nudef = PatternUtil.replacePlaceholders(definition, "nudef", "value0", "value1", "value2", "value3"); assertEquals("nudef", nudef.getName()); - Attribute attribute = nudef.getAttribute("something"); - assertEquals("some-value1-${requestScope.someVariable}.jsp", attribute.getValue()); + + assertEquals( + "some-value1-${requestScope.someVariable}-other-value2.jsp", + nudef.getAttribute("something").getValue()); + + assertEquals( + "some-value1-${requestScope.someVariable}-other-value2.jsp", + nudef.getAttribute("something").getExpressionObject().getExpression()); + } + + /** + * Test method for + * {@link PatternUtil#replacePlaceholders(Definition, String, Object[])}. + * See TILES-574 + */ + @Test + public void testReplacePlaceholdersEL_2() { + Map attributes = new HashMap(); + Attribute attribute = new Attribute("some-${requestScope.someVariable}-other-{1}-${requestScope.someOtherVariable}.jsp"); + attribute.setExpressionObject(new Expression((String)attribute.getValue())); + attributes.put("something", attribute); + Definition definition = new Definition("definitionName", new Attribute("template"), attributes); + Definition nudef = PatternUtil.replacePlaceholders(definition, "nudef", "value0", "value1", "value2", "value3"); + assertEquals("nudef", nudef.getName()); + + assertEquals( + "some-${requestScope.someVariable}-other-value1-${requestScope.someOtherVariable}.jsp", + nudef.getAttribute("something").getValue()); + + assertEquals( + "some-${requestScope.someVariable}-other-value1-${requestScope.someOtherVariable}.jsp", + nudef.getAttribute("something").getExpressionObject().getExpression()); } } From c32892135ba8271fa8c5daba9ffbc37bb68d55c2 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Wed, 27 Nov 2013 21:23:29 +0000 Subject: [PATCH 34/65] =?UTF-8?q?TILES-576=20=E2=80=93=C2=A0Please=20delet?= =?UTF-8?q?e=20old=20releases=20from=20mirroring=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1546198 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/dev/release.apt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt index bd22d74d7..966649d8c 100644 --- a/src/site/apt/dev/release.apt +++ b/src/site/apt/dev/release.apt @@ -319,4 +319,9 @@ Please feel free to test the distribution and post your comments to the user list, or, if appropriate, file a ticket with JIRA. -------------------------------------- +** Delete old releases + + As described in http://www.apache.org/dev/release.html#when-to-archive + + <> From f07e17d75afcf6ede8a5093cd3d8d71a0968f51c Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Tue, 25 Feb 2014 10:48:17 +0000 Subject: [PATCH 35/65] Use blank strings instead of nulls as placeholder values when replacing placeholders. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reference from mailing list: http://thread.gmane.org/gmane.comp.apache.tiles.user/685 > > > > > > > > > > > The above rules match a pattern employed with spring-mobile where > views can be resolved based on (mob)ile/(tab)let/normal , as normal is > a fallback it does not contain a suffix. > > I can understand why this fails as the capture {1} does not exist in > the found pattern, instead I'd like it to recognise this and evaluate > to an empty string. > > Full stack-trace is as follows: > java.lang.NullPointerException > at org.apache.tiles.BasicAttributeContext.inherit(BasicAttributeContext.java:212) > at org.apache.tiles.definition.dao.ResolvingLocaleUrlDefinitionDAO.getDefinitionFromResolver(ResolvingLocaleUrlDefinitionDAO.java:84) > … The code ends up looking for "layoutnull" instead of "layout". This comes from in RegexpDefinitionPatternMatcher.createDefinition(..) the call to matcher.group(i) returning null. Rather than fix it there though i'd rather put the fix in lower down in PatternUtil.replacePlaceholders(..) so that any nulls in the vars parameter are always replaced with blanks. git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1571643 13f79535-47bb-0310-9956-ffa450edef68 --- .../tiles/definition/pattern/PatternUtil.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java index edc82b957..f84d0f713 100644 --- a/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java +++ b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java @@ -67,12 +67,15 @@ private PatternUtil() { * * @param d The definition to replace. * @param name The name of the definition to be created. - * @param vars The variables to be substituted. + * @param varsOrig The variables to be substituted. * @return The definition that can be rendered. * @since 2.2.0 */ public static Definition replacePlaceholders(Definition d, String name, - Object... vars) { + Object... varsOrig) { + + Object[] vars = replaceNullsWithBlank(varsOrig); + Definition nudef = new Definition(); nudef.setExtends(replace(d.getExtends(), vars)); @@ -229,4 +232,12 @@ private static String replace(String st, Object... vars) { } return st; } + + private static Object[] replaceNullsWithBlank(Object[] varsOrig) { + Object[] vars = new Object[varsOrig.length]; + for(int i = 0; i < varsOrig.length; ++i) { + vars[i] = null != varsOrig[i] ? varsOrig[i] : ""; + } + return vars; + } } From 32fa836b58f611485cf7a8a908fd40016af629b3 Mon Sep 17 00:00:00 2001 From: Michael Semb Wever Date: Sun, 30 Mar 2014 13:57:47 +0000 Subject: [PATCH 36/65] =?UTF-8?q?TILES-571=20=E2=80=93=20Please=20make=20t?= =?UTF-8?q?he=20significance=20of=20underscore=20(=5F)=20in=20tiles=20defi?= =?UTF-8?q?nition=20filename=20more=20obvious=20SPR-11491=20=E2=80=93?= =?UTF-8?q?=C2=A0Doc:=20Tiles=203=20and=20underscores=20in=20definition=20?= =?UTF-8?q?names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … it looks like there is an issue with PostfixedApplicationResource. This issue comes from SpringWildcardServletTilesApplicationContext#getResources(String) -> URLApplicationResource(String, URL) constructor -> super PostfixedApplicationResource(String localePath) constructor. When there is an underscore, the string after the last underscore is identified as the locale. But clearly it's not a locale and one should be able to load /WEB-INF/base_tiles.xml. Along with improving the documentation the following code changes have been made • if the resource name contains "_" and after it there is no supported locale language code then the whole resource name is treated as a non-localized path. This situation prints a warning like > No supported matching language for locale "zz". Using /my/path_zz.html as a non-localized resource path. • if the resource name contains "_" and after it there is a supported locale language code but the locale constructed isn't valid/supported then the closest supported locale is used.
This situation prints a warning like
 > For resource /my/path_en_ZZ.html the closest supported matching locale to "en_ZZ" is "en". Using /my/path.html as resource path. git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1583141 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/config-reference.apt | 47 +++++++++++++++++-------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/src/site/apt/config-reference.apt b/src/site/apt/config-reference.apt index 71a7b6dce..8dd602c5e 100644 --- a/src/site/apt/config-reference.apt +++ b/src/site/apt/config-reference.apt @@ -143,9 +143,14 @@ Configuring Tiles internals The reason to use a custom Tiles application context could be: - * supporting a platform not supported yet; + * supporting a platform not supported yet; - * providing custom behaviour, such as loading resources in a different manner. + * providing custom behaviour, such as loading resources in a different manner. + + + When loading resources (by {{{/tiles-request/apidocs/org/apache/tiles/request/locale/PostfixedApplicationResource.html}default}}) + an underscore in the name of a file is used to indicate locale information. + See the documentation for {{{/framework/tutorial/advanced/l10n.html}localization}}. * Custom {TilesContainerFactory} @@ -160,41 +165,41 @@ Configuring Tiles internals {{{./apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html}Javadoc documentation of BasicTilesContainerFactory}} documents all the methods that can be overridden to use your own configuration. - + ** Changing the path for the Tiles Definitions file The <<>> loads the "/WEB-INF/tiles.xml" file; the <<>> loads all the files named "tiles*.xml" under /WEB-INF and under every META-INF in any part of the classpath. - + If this behaviour doesn't suits you, you can override the method <<>> and retrieve whatever resource you prefer. Just specify the path for the default locale; Tiles will extrapolate and load the localized files as needed. * Custom components These components can be used by overriding the appropriate <<>> method in a custom TilesContainerFactory. - + ** Custom {LocaleResolver} - + The default implementation is {{{./apidocs/org/apache/tiles/locale/impl/DefaultLocaleResolver.html}DefaultLocaleResolver}}. ** Custom {DefinitionDAO} The default implementation is {{{./apidocs/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.html}ResolvingLocaleUrlDefinitionDAO}}. - + ** Custom {AttributeEvaluatorFactory} The default implementation is {{{./apidocs/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactory.html}BasicAttributeEvaluatorFactory}}. - + It can be used with a number of AttributeEvaluators like: - - * the {{{./apidocs/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.html}DirectAttributeEvaluator}}, - * the {{{./apidocs/org/apache/tiles/el/ELAttributeEvaluator.html}ELAttributeEvaluator}}, + * the {{{./apidocs/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.html}DirectAttributeEvaluator}}, + + * the {{{./apidocs/org/apache/tiles/el/ELAttributeEvaluator.html}ELAttributeEvaluator}}, + + * the {{{./apidocs/org/apache/tiles/mvel/MVELAttributeEvaluator.html}MVELAttributeEvaluator}}, - * the {{{./apidocs/org/apache/tiles/mvel/MVELAttributeEvaluator.html}MVELAttributeEvaluator}}, + * the {{{./apidocs/org/apache/tiles/ognl/OGNLAttributeEvaluator.html}OGNLAttributeEvaluator}}. - * the {{{./apidocs/org/apache/tiles/ognl/OGNLAttributeEvaluator.html}OGNLAttributeEvaluator}}. - Please see {{{./xref/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.html}CompleteAutoloadTilesContainerFactory}} for an example of how to configure those. @@ -214,20 +219,20 @@ Configuring Tiles internals The default implementation is {{{./apidocs/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.html}BasicPatternDefinitionResolver}}, that implements the syntax. - - <<>> defines a <<>> to enable the use of + + <<>> defines a <<>> to enable the use of both the syntax and the syntax, with appropriate prefixes. * Registering {Renderers} Custom {{{/tiles-request/apidocs/org/apache/tiles/request/render/Renderer.html}Renderers}} can be registered by overriding the methods <<>> and <<>>. - + <<>> registers 3 renderers: <<>>, <<