WW-2069 Replaces 'id' and 'name' with 'var'.

liuruizhi · Nov 27, 2015 · 705915a · 705915a
1 parent ed8dc57
commit 705915a
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 78 deletions.
diff --git 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>
diff --git 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>
diff --git 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>
diff --git 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>

diff --git 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>

diff --git a/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl b/apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
@@ -13,23 +13,23 @@
 		<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>
 		    <td width="70" align="right">
 		      <#-- 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,28 +49,28 @@
 		  <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>
 		    <td>
 		    <#-- 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>
 

diff --git 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"

diff --git 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>

diff --git 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"/>
diff --git 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>

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
@@ -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>

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
@@ -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>

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
@@ -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>

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
@@ -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>.
 
 

diff --git a/.../showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/.../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>

diff --git a/...ank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp b/...ank/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>

diff --git a/...nvention/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp b/...nvention/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>

diff --git a/...e-dbportlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/view/index.jsp b/...e-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>

diff --git 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>

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
@@ -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>

diff --git 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>

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
@@ -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>