You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2015/11/27 22:00:16 UTC
struts git commit: WW-2069 Replaces 'id' and 'name' with 'var'.
Repository: struts
Updated Branches:
refs/heads/master ed8dc577b -> 705915abd
WW-2069 Replaces 'id' and 'name' with 'var'.
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/705915ab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/705915ab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/705915ab
Branch: refs/heads/master
Commit: 705915abd22d1100a89497663bf0ba0fb81fd2f6
Parents: ed8dc57
Author: Aleksandr Mashchenko <am...@apache.org>
Authored: Fri Nov 27 22:58:50 2015 +0200
Committer: Aleksandr Mashchenko <am...@apache.org>
Committed: Fri Nov 27 22:58:50 2015 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/view/helloWorld.vm | 2 +-
apps/portlet/src/main/webapp/tiles/footer.ftl | 2 +-
apps/portlet/src/main/webapp/tiles/footer.jsp | 2 +-
apps/portlet/src/main/webapp/tiles/index.jsp | 2 +-
.../webapp/WEB-INF/empmanager/editSkill.jsp | 6 +--
.../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 52 ++++++++++----------
.../hangman/updateCharacterAvailable.ftl | 24 ++++-----
.../webapp/WEB-INF/hangman/updateGuessLeft.ftl | 4 +-
.../webapp/WEB-INF/hangman/updateScaffold.ftl | 4 +-
.../WEB-INF/hangman/updateVocabCharacters.ftl | 12 ++---
.../main/webapp/WEB-INF/person/edit-person.jsp | 6 +--
.../main/webapp/WEB-INF/person/list-people.ftl | 6 +--
.../main/webapp/WEB-INF/person/new-person.ftl | 6 +--
.../non-ui/actionPrefix/actionPrefixExample.ftl | 2 +-
.../iteratorTag/appendIteratorTagDemoResult.jsp | 2 +-
.../main/webapp/WEB-INF/example/HelloWorld.jsp | 4 +-
.../src/main/webapp/WEB-INF/content/hello.jsp | 4 +-
.../src/main/webapp/WEB-INF/view/index.jsp | 2 +-
.../resources/config-browser/actionNames.ftl | 2 +-
.../resources/config-browser/page-header.ftl | 8 +--
.../resources/config-browser/showConfig.ftl | 2 +-
.../resources/config-browser/tigris-macros.ftl | 2 +-
22 files changed, 78 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm b/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
index 5007bf7..4fcf4d6 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
+++ b/apps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
@@ -1,4 +1,4 @@
Hello World from velocity!
<p />
-#surl ("id=url" "action=index")
+#surl ("var=url" "action=index")
<a href="${url}">Back to the front page</a>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/portlet/src/main/webapp/tiles/footer.ftl
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/tiles/footer.ftl b/apps/portlet/src/main/webapp/tiles/footer.ftl
index adc2fd8..b5e7a6f 100644
--- a/apps/portlet/src/main/webapp/tiles/footer.ftl
+++ b/apps/portlet/src/main/webapp/tiles/footer.ftl
@@ -1,5 +1,5 @@
<hr/>
-<@s.url id="home" action="index" namespace="/view" />
+<@s.url var="home" action="index" namespace="/view" />
<div>
<p>Powered by Struts2 Portlet/Tiles Plugin | <@s.a href="${home}">Back to front page</...@s.a></p>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/portlet/src/main/webapp/tiles/footer.jsp
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/tiles/footer.jsp b/apps/portlet/src/main/webapp/tiles/footer.jsp
index 5dda204..557f007 100644
--- a/apps/portlet/src/main/webapp/tiles/footer.jsp
+++ b/apps/portlet/src/main/webapp/tiles/footer.jsp
@@ -1,6 +1,6 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<hr/>
-<s:url id="home" action="index" namespace="/view" />
+<s:url var="home" action="index" namespace="/view" />
<div>
<p>Powered by Struts2 Portlet/Tiles Plugin | <s:a href="%{home}">Back to front page</s:a></p>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/portlet/src/main/webapp/tiles/index.jsp
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/webapp/tiles/index.jsp b/apps/portlet/src/main/webapp/tiles/index.jsp
index 906abb1..875f60c 100644
--- a/apps/portlet/src/main/webapp/tiles/index.jsp
+++ b/apps/portlet/src/main/webapp/tiles/index.jsp
@@ -5,7 +5,7 @@
<h4>Features</h4>
<ul>
<li>
- <s:url id="freemarker" namespace="/tiles" action="processTilesFreemarkerExample" method="input" />
+ <s:url var="freemarker" namespace="/tiles" action="processTilesFreemarkerExample" method="input" />
<s:a href="%{freemarker}">View FreeMarker Example</s:a>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
index 9e0bc29..71f9f83 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/empmanager/editSkill.jsp
@@ -2,11 +2,11 @@
<html>
<head>
<s:if test="currentSkill!=null">
- <s:set name="submitType" value="'update'"/>
- <s:text id="title" name="item.edit"><s:param><s:text name="skill"/></s:param></s:text>
+ <s:set var="submitType" value="'update'"/>
+ <s:text var="title" name="item.edit"><s:param><s:text name="skill"/></s:param></s:text>
</s:if>
<s:else>
- <s:set name="submitType" value="'create'"/>
+ <s:set var="submitType" value="'create'"/>
<s:text var="title" name="item.create"><s:param><s:text name="skill"/></s:param></s:text>
</s:else>
<title>Struts2 Showcase - CRUD Example - <s:property value="#title"/></title>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
index 0bc2335..b3d112d 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
@@ -13,7 +13,7 @@
<table>
<tr>
<td>
- <@s.url id="url" value="/hangman/images/hangman.png" />
+ <@s.url var="url" value="/hangman/images/hangman.png" />
<img alt="Hangman" src="<@s.property value="%{#url}" />"
width="197" height="50" border="0"/>
</td>
@@ -21,15 +21,15 @@
<#-- Guesses Left -->
<div id="updateGuessLeftDiv">
<#if (hangman.guessLeft() >= 0)>
- <@s.set name="guessLeftImageName" value="%{'Chalkboard_'+hangman.guessLeft()+'.png'}" />
- <@s.url id="url" value="%{'/hangman/images/'+#guessLeftImageName}" />
+ <@s.set var="guessLeftImageName" value="%{'Chalkboard_'+hangman.guessLeft()+'.png'}" />
+ <@s.url var="url" value="%{'/hangman/images/'+#guessLeftImageName}" />
<img alt="No. Guesses Left"
src="<@s.property value="%{#url}"/>" width="20" height="20" border="0" />
</#if>
</div>
</td>
<td>
- <@s.url id="url" value="/hangman/images/guesses-left.png" />
+ <@s.url var="url" value="/hangman/images/guesses-left.png" />
<img alt="Guesses Left"
src="<@s.property value="%{#url}" />" width="164" height="11" border="0"/>
</td>
@@ -39,8 +39,8 @@
<td align="left">
<#-- Display Scaffold -->
<div id="updateScaffoldDiv">
- <@s.set name="scaffoldImageName" value="%{'scaffold_'+hangman.guessLeft()+'.png'}" />
- <@s.url id="url" value="%{'/hangman/images/'+#scaffoldImageName}" />
+ <@s.set var="scaffoldImageName" value="%{'scaffold_'+hangman.guessLeft()+'.png'}" />
+ <@s.url var="url" value="%{'/hangman/images/'+#scaffoldImageName}" />
<img src="<@s.property value="%{#url}" />" border="0"/>
</div>
</td>
@@ -49,7 +49,7 @@
<tr>
<td width="160">
<p align="right">
- <@s.url id="url" value="/hangman/images/guess.png" />
+ <@s.url var="url" value="/hangman/images/guess.png" />
<img alt="Current Guess" src="<@s.property value="%{#url}" />"
align="MIDDLE" width="127" height="20" border="0"/></p>
</td>
@@ -57,20 +57,20 @@
<#-- Display Vacab -->
<div id="updateVocabDiv">
<#if hangman.gameEnded()>
- <@s.iterator id="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
- <@s.url id="url" value="%{'/hangman/images/Chalkboard_'+#currentCharacter.toString()+'.png'}" />
+ <@s.iterator var="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
+ <@s.url var="url" value="%{'/hangman/images/Chalkboard_'+#currentCharacter.toString()+'.png'}" />
<img height="36" alt="<@s.property value="%{#currentCharacter}" />"
src="<@s.property value="%{#url}" />" width="36" border="0" />
</...@s.iterator>
<#else>
- <@s.iterator id="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
+ <@s.iterator var="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
<#if hangman.characterGuessedBefore(currentCharacter)>
- <@s.set name="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter.toString()+'.png'}" />
- <@s.url id="url" value="%{'/hangman/images/'+#chalkboardImageName}" />
+ <@s.set var="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter.toString()+'.png'}" />
+ <@s.url var="url" value="%{'/hangman/images/'+#chalkboardImageName}" />
<img height="36" alt="<@s.property value="%{#currentCharacter}" />"
src="<@s.property value="%{#url}" />" width="36" border="0"/>
<#else>
- <@s.url id="url" value="/hangman/images/Chalkboard_underscroll.png" />
+ <@s.url var="url" value="/hangman/images/Chalkboard_underscroll.png" />
<img height="36" alt="_"
src="<@s.property value="%{#url}" />" width="36" border="0"/>
</#if>
@@ -82,7 +82,7 @@
<tr>
<td valign="top">
<p align="right">
- <@s.url id="url" value="/hangman/images/choose.png" />
+ <@s.url var="url" value="/hangman/images/choose.png" />
<img alt="Choose" src="<@s.property value="%{#url}" />"
height="20" width="151" border="0"/>
</p>
@@ -92,13 +92,13 @@
<#-- Show Characters Available -->
<div id="updateCharacterAvailableDiv">
<#if hangman.gameEnded()>
- <@s.set name="winImageName" value="%{'you-win.png'}" />
- <@s.set name="looseImageName" value="%{'you-lose.png'}" />
- <@s.set name="startImageName" value="%{'start.png'}" />
- <@s.url id="winImageUrl" value="%{'/hangman/images/'+#winImageName}" />
- <@s.url id="looseImageUrl" value="%{'/hangman/images/'+#looseImageName}" />
- <@s.url id="startImageUrl" value="%{'/hangman/images/'+#startImageName}" />
- <@s.url id="startHref" action="hangmanNonAjax" namespace="/hangman" />
+ <@s.set var="winImageName" value="%{'you-win.png'}" />
+ <@s.set var="looseImageName" value="%{'you-lose.png'}" />
+ <@s.set var="startImageName" value="%{'start.png'}" />
+ <@s.url var="winImageUrl" value="%{'/hangman/images/'+#winImageName}" />
+ <@s.url var="looseImageUrl" value="%{'/hangman/images/'+#looseImageName}" />
+ <@s.url var="startImageUrl" value="%{'/hangman/images/'+#startImageName}" />
+ <@s.url var="startHref" action="hangmanNonAjax" namespace="/hangman" />
<#if hangman.isWin()>
<img src="<@s.property value="%{#winImageUrl}" />" width="341" height="44" />
@@ -109,11 +109,11 @@
<img src="<@s.property value="%{#startImageUrl}" />" width="250" height="43" />
</...@s.a>
<#else>
- <@s.iterator id="currentCharacter" value="%{hangman.charactersAvailable}" status="stat">
- <@s.set name="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter+'.png'}" />
- <@s.url id="chalkboardImageUrl" value="%{'/hangman/images/'+#chalkboardImageName}" />
- <@s.url id="spacerUrl" value="/hangman/images/letter-spacer.png" />
- <@s.url id="url" action="guessCharacterNonAjax" namespace="/hangman">
+ <@s.iterator var="currentCharacter" value="%{hangman.charactersAvailable}" status="stat">
+ <@s.set var="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter+'.png'}" />
+ <@s.url var="chalkboardImageUrl" value="%{'/hangman/images/'+#chalkboardImageName}" />
+ <@s.url var="spacerUrl" value="/hangman/images/letter-spacer.png" />
+ <@s.url var="url" action="guessCharacterNonAjax" namespace="/hangman">
<@s.param name="character" value="%{#currentCharacter}" />
</...@s.url>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl
index 84281d0..b5b000d 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateCharacterAvailable.ftl
@@ -1,11 +1,11 @@
<#if hangman.gameEnded()>
- <@s.set name="winImageName" value="%{'you-win.png'}" />
- <@s.set name="looseImageName" value="%{'you-lose.png'}" />
- <@s.set name="startImageName" value="%{'start.png'}" />
- <@s.url id="winImageUrl" value="%{'/hangman/images/'+#winImageName}" />
- <@s.url id="looseImageUrl" value="%{'/hangman/images/'+#looseImageName}" />
- <@s.url id="startImageUrl" value="%{'/hangman/images/'+#startImageName}" />
- <@s.url id="startHref" action="hangmanAjax" namespace="/hangman" />
+ <@s.set var="winImageName" value="%{'you-win.png'}" />
+ <@s.set var="looseImageName" value="%{'you-lose.png'}" />
+ <@s.set var="startImageName" value="%{'start.png'}" />
+ <@s.url var="winImageUrl" value="%{'/hangman/images/'+#winImageName}" />
+ <@s.url var="looseImageUrl" value="%{'/hangman/images/'+#looseImageName}" />
+ <@s.url var="startImageUrl" value="%{'/hangman/images/'+#startImageName}" />
+ <@s.url var="startHref" action="hangmanAjax" namespace="/hangman" />
<#if hangman.isWin()>
<img src="<@s.property value="%{#winImageUrl}" />" width="341" height="44" />
@@ -16,11 +16,11 @@
<img src="<@s.property value="%{#startImageUrl}" />" width="250" height="43" />
</...@s.a>
<#else>
-<@s.iterator id="currentCharacter" value="%{hangman.charactersAvailable}" status="stat">
- <@s.set name="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter+'.png'}" />
- <@s.url id="chalkboardImageUrl" value="%{'/hangman/images/'+#chalkboardImageName}" />
- <@s.url id="spacerUrl" value="/hangman/images/letter-spacer.png" />
- <@s.url id="blankUrl" value="ajax/blank.action" includeContext="false" />
+<@s.iterator var="currentCharacter" value="%{hangman.charactersAvailable}" status="stat">
+ <@s.set var="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter+'.png'}" />
+ <@s.url var="chalkboardImageUrl" value="%{'/hangman/images/'+#chalkboardImageName}" />
+ <@s.url var="spacerUrl" value="/hangman/images/letter-spacer.png" />
+ <@s.url var="blankUrl" value="ajax/blank.action" includeContext="false" />
<@sx.a id="%{#currentCharacter}"
afterNotifyTopics="topicGuessMade"
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl
index 8b5ef4e..22b6904 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateGuessLeft.ftl
@@ -1,6 +1,6 @@
<#if (hangman.guessLeft() >= 0)>
- <@s.set name="guessLeftImageName" value="%{'Chalkboard_'+hangman.guessLeft()+'.png'}" />
- <@s.url id="url" value="%{'/hangman/images/'+#guessLeftImageName}" />
+ <@s.set var="guessLeftImageName" value="%{'Chalkboard_'+hangman.guessLeft()+'.png'}" />
+ <@s.url var="url" value="%{'/hangman/images/'+#guessLeftImageName}" />
<img alt="No. Guesses Left"
src="<@s.property value="%{#url}"/>" width="20" height="20" border="0" />
</#if>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl
index afd11b6..24fdcff 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateScaffold.ftl
@@ -1,3 +1,3 @@
- <@s.set name="scaffoldImageName" value="%{'scaffold_'+hangman.guessLeft()+'.png'}" />
- <@s.url id="url" value="%{'/hangman/images/'+#scaffoldImageName}" />
+ <@s.set var="scaffoldImageName" value="%{'scaffold_'+hangman.guessLeft()+'.png'}" />
+ <@s.url var="url" value="%{'/hangman/images/'+#scaffoldImageName}" />
<img src="<@s.property value="%{#url}" />" border="0"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl
index d4b370b..2abb554 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/hangman/updateVocabCharacters.ftl
@@ -1,18 +1,18 @@
<#if hangman.gameEnded()>
-<@s.iterator id="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
- <@s.url id="url" value="%{'/hangman/images/Chalkboard_'+#currentCharacter.toString()+'.png'}" />
+<@s.iterator var="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
+ <@s.url var="url" value="%{'/hangman/images/Chalkboard_'+#currentCharacter.toString()+'.png'}" />
<img height="36" alt="<@s.property value="%{#currentCharacter}" />"
src="<@s.property value="%{#url}" />" width="36" border="0" />
</...@s.iterator>
<#else>
-<@s.iterator id="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
+<@s.iterator var="currentCharacter" value="%{hangman.vocab.inCharacters()}" stat="stat">
<#if hangman.characterGuessedBefore(currentCharacter)>
- <@s.set name="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter.toString()+'.png'}" />
- <@s.url id="url" value="%{'/hangman/images/'+#chalkboardImageName}" />
+ <@s.set var="chalkboardImageName" value="%{'Chalkboard_'+#currentCharacter.toString()+'.png'}" />
+ <@s.url var="url" value="%{'/hangman/images/'+#chalkboardImageName}" />
<img height="36" alt="<@s.property value="%{#currentCharacter}" />"
src="<@s.property value="%{#url}" />" width="36" border="0"/>
<#else>
- <@s.url id="url" value="/hangman/images/Chalkboard_underscroll.png" />
+ <@s.url var="url" value="/hangman/images/Chalkboard_underscroll.png" />
<img height="36" alt="_"
src="<@s.property value="%{#url}" />" width="36" border="0"/>
</#if>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp b/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
index 2847ca1..4688483 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/person/edit-person.jsp
@@ -12,11 +12,11 @@
<div class="row">
<div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
- <s:url id="listpeopleurl" action="list-people" namespace="/person" />
+ <s:url var="listpeopleurl" action="list-people" namespace="/person" />
<li><s:a href="%{listpeopleurl}">List all people</s:a> </li>
- <s:url id="editpersonurl" action="edit-person" namespace="/person" />
+ <s:url var="editpersonurl" action="edit-person" namespace="/person" />
<li class="active"><s:a href="%{editpersonurl}">Edit people</s:a></li>
- <s:url id="newpersonurl" action="new-person" namespace="/person" method="input"/>
+ <s:url var="newpersonurl" action="new-person" namespace="/person" method="input"/>
<li><s:a href="%{newpersonurl}">Create a new person</s:a></li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl b/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
index 8a601f1..082134b 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/person/list-people.ftl
@@ -11,11 +11,11 @@
<div class="row">
<div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
- <@s.url id="listpeopleurl" action="list-people" />
+ <@s.url var="listpeopleurl" action="list-people" />
<li class="active"><@s.a href="%{listpeopleurl}">List all people</...@s.a></li>
- <@s.url id="editpersonurl" action="edit-person" />
+ <@s.url var="editpersonurl" action="edit-person" />
<li><@s.a href="%{editpersonurl}">Edit people</...@s.a></li>
- <@s.url id="newpersonurl" action="new-person" method="input" />
+ <@s.url var="newpersonurl" action="new-person" method="input" />
<li><@s.a href="%{newpersonurl}">Create a new person</...@s.a></li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl b/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
index 77ccd8e..25d2dbc 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
@@ -11,11 +11,11 @@
<div class="row">
<div class="col-md-3">
<ul class="nav nav-tabs nav-stacked">
- <@s.url id="listpeopleurl" action="list-people" />
+ <@s.url var="listpeopleurl" action="list-people" />
<li><@s.a href="%{listpeopleurl}">List all people</...@s.a></li>
- <@s.url id="editpersonurl" action="edit-person" />
+ <@s.url var="editpersonurl" action="edit-person" />
<li><@s.a href="%{editpersonurl}">Edit people</...@s.a></li>
- <@s.url id="newpersonurl" action="new-person" />
+ <@s.url var="newpersonurl" action="new-person" />
<li class="active"><@s.a href="%{newpersonurl}">Create a new person</...@s.a></li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
index 8ffe85e..cc09ac8 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
@@ -29,7 +29,7 @@
redirect (a new request is issue from the client), the text entered will be lost.<p/>
- <@s.url id="url" action="viewSource" namespace="/tags/non-ui/actionPrefix" />
+ <@s.url var="url" action="viewSource" namespace="/tags/non-ui/actionPrefix" />
The JSP code can be read <@s.a href="%{#url}">here</...@s.a>.
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
index 4df1ea9..0076d9f 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
@@ -16,7 +16,7 @@
<s:generator var="iterator1" separator="," val="%{iteratorValue1}" />
<s:generator var="iterator2" separator="," val="%{iteratorValue2}" />
- <s:append id="appendedIterator">
+ <s:append var="appendedIterator">
<s:param value="%{#attr.iterator1}" />
<s:param value="%{#attr.iterator2}" />
</s:append>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
index 938c761..189fdc5 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
@@ -11,13 +11,13 @@
<h3>Languages</h3>
<ul>
<li>
- <s:url id="url" action="HelloWorld">
+ <s:url var="url" action="HelloWorld">
<s:param name="request_locale">en</s:param>
</s:url>
<s:a href="%{url}">English</s:a>
</li>
<li>
- <s:url id="url" action="HelloWorld">
+ <s:url var="url" action="HelloWorld">
<s:param name="request_locale">es</s:param>
</s:url>
<s:a href="%{url}">Espanol</s:a>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
index 907c1b6..056b89f 100644
--- a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
+++ b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
@@ -11,13 +11,13 @@
<h3>Languages</h3>
<ul>
<li>
- <s:url id="url" action="hello">
+ <s:url var="url" action="hello">
<s:param name="request_locale">en</s:param>
</s:url>
<s:a href="%{url}">English</s:a>
</li>
<li>
- <s:url id="url" action="hello">
+ <s:url var="url" action="hello">
<s:param name="request_locale">es</s:param>
</s:url>
<s:a href="%{url}">Espanol</s:a>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp
index 10f2e87..fa0b7b0 100644
--- a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp
+++ b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp
@@ -8,7 +8,7 @@ This a simple table showing the database data:
<th>Name</th>
<th>Value</th>
</tr>
- <s:iterator id="row" value="%{data}">
+ <s:iterator var="row" value="%{data}">
<tr>
<td><s:property value="%{STR_COL}" /></td>
<td><s:property value="%{NUM_COL}" /></td>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl b/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
index d7e8651..9721afd 100644
--- a/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
@@ -28,7 +28,7 @@
<td>
<ul>
<#list actionNames as name>
- <@s.url id="showConfig" action="showConfig" includeParams="none">
+ <@s.url var="showConfig" action="showConfig" includeParams="none">
<@s.param name="namespace">${namespace}</...@s.param>
<@s.param name="actionName">${name}</...@s.param>
</...@s.url>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/page-header.ftl b/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
index 553f57f..18ee1a6 100644
--- a/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
@@ -49,13 +49,13 @@
--> <div class="toolgroup">
<div class="label"><strong>Configuration</strong></div>
<div class="body">
- <div><@s.url id="constantsLink" action="showConstants" includeParams="none" />
+ <div><@s.url var="constantsLink" action="showConstants" includeParams="none" />
<a href="${constantsLink}">Constants</a>
</div>
- <div><@s.url id="beansLink" action="showBeans" includeParams="none" />
+ <div><@s.url var="beansLink" action="showBeans" includeParams="none" />
<a href="${beansLink}">Beans</a>
</div>
- <div><@s.url id="jarsLink" action="showJars" includeParams="none" />
+ <div><@s.url var="jarsLink" action="showJars" includeParams="none" />
<a href="${jarsLink}">Jars (requires Maven 2 data)</a>
</div>
</div>
@@ -80,7 +80,7 @@
<div class="label"><strong>Actions in <#if namespace == ""> default <#else> ${namespace} </#if></strong></div>
<#foreach name in actionNames>
<div>
- <@s.url id="actionLink" action="showConfig" includeParams="none" escapeAmp="false">
+ <@s.url var="actionLink" action="showConfig" includeParams="none" escapeAmp="false">
<@s.param name="namespace">${namespace}</...@s.param>
<@s.param name="actionName">${name}</...@s.param>
</...@s.url>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
index 400d636..42e0934 100644
--- a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
@@ -41,7 +41,7 @@
</table>
<!-- URLTag is faulty -->
-<@s.url id="url" action="showConfig" includeParams="none">
+<@s.url var="url" action="showConfig" includeParams="none">
<@s.param name="namespace">${namespace}</...@s.param>
<@s.param name="actionName">${actionName}</...@s.param>
</...@s.url>
http://git-wip-us.apache.org/repos/asf/struts/blob/705915ab/plugins/config-browser/src/main/resources/config-browser/tigris-macros.ftl
----------------------------------------------------------------------
diff --git a/plugins/config-browser/src/main/resources/config-browser/tigris-macros.ftl b/plugins/config-browser/src/main/resources/config-browser/tigris-macros.ftl
index 860c509..4bb4d42 100644
--- a/plugins/config-browser/src/main/resources/config-browser/tigris-macros.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/tigris-macros.ftl
@@ -92,7 +92,7 @@
<strong>${caption}</strong></p>
${message}
<#if errors?exists>
- <@s.iterator id="e" value="errors">
+ <@s.iterator var="e" value="errors">
<#assign e = stack.findString('top') />
<#call error(e)>
</...@s.iterator>