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 5007bf76a..4fcf4d694 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!

-#surl ("id=url" "action=index") +#surl ("var=url" "action=index") Back to the front page diff --git a/apps/portlet/src/main/webapp/tiles/footer.ftl b/apps/portlet/src/main/webapp/tiles/footer.ftl index adc2fd846..b5e7a6ff0 100644 --- a/apps/portlet/src/main/webapp/tiles/footer.ftl +++ b/apps/portlet/src/main/webapp/tiles/footer.ftl @@ -1,5 +1,5 @@


-<@s.url id="home" action="index" namespace="/view" /> +<@s.url var="home" action="index" namespace="/view" />

Powered by Struts2 Portlet/Tiles Plugin | <@s.a href="${home}">Back to front page

diff --git a/apps/portlet/src/main/webapp/tiles/footer.jsp b/apps/portlet/src/main/webapp/tiles/footer.jsp index 5dda20467..557f00792 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" %>
- +

Powered by Struts2 Portlet/Tiles Plugin | Back to front page

diff --git a/apps/portlet/src/main/webapp/tiles/index.jsp b/apps/portlet/src/main/webapp/tiles/index.jsp index 906abb1c0..875f60c58 100644 --- a/apps/portlet/src/main/webapp/tiles/index.jsp +++ b/apps/portlet/src/main/webapp/tiles/index.jsp @@ -5,7 +5,7 @@

Features

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 9e0bc291d..71f9f8393 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 @@ - - + + - + Struts2 Showcase - CRUD Example - <s:property value="#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 index 0bc2335b6..b3d112d76 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 @@ @@ -21,15 +21,15 @@ <#-- Guesses Left -->
<#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}" /> No. Guesses Left" width="20" height="20" border="0" />
@@ -39,8 +39,8 @@ @@ -49,7 +49,7 @@ @@ -57,20 +57,20 @@ <#-- Display Vacab -->
<#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'}" /> <@s.property value=" src="<@s.property value="%{#url}" />" width="36" border="0" /> <#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}" /> <@s.property value=" 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" /> _" width="36" border="0"/> @@ -82,7 +82,7 @@
- + 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 d7e86510d..9721afddf 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 @@
- <@s.url id="url" value="/hangman/images/hangman.png" /> + <@s.url var="url" value="/hangman/images/hangman.png" /> Hangman" width="197" height="50" border="0"/> - <@s.url id="url" value="/hangman/images/guesses-left.png" /> + <@s.url var="url" value="/hangman/images/guesses-left.png" /> Guesses Left" width="164" height="11" border="0"/> <#-- Display Scaffold -->
- <@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}" /> " border="0"/>

- <@s.url id="url" value="/hangman/images/guess.png" /> + <@s.url var="url" value="/hangman/images/guess.png" /> Current Guess" align="MIDDLE" width="127" height="20" border="0"/>

- <@s.url id="url" value="/hangman/images/choose.png" /> + <@s.url var="url" value="/hangman/images/choose.png" /> Choose" height="20" width="151" border="0"/>

@@ -92,13 +92,13 @@ <#-- Show Characters Available -->
<#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()> " width="341" height="44" /> @@ -109,11 +109,11 @@ " width="250" height="43" /> <#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}" /> 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 84281d0fe..b5b000d27 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()> " width="341" height="44" /> @@ -16,11 +16,11 @@ " width="250" height="43" /> <#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 index 8b5ef4ebe..22b690400 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}" /> No. Guesses Left" width="20" height="20" border="0" /> 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 afd11b6e2..24fdcffba 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}" /> " 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 index d4b370b97..2abb554d0 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'}" /> <@s.property value=" src="<@s.property value="%{#url}" />" width="36" border="0" /> <#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}" /> <@s.property value=" 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" /> _" width="36" border="0"/> 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 2847ca107..468848375 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 @@
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 8a601f17a..082134b9a 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 @@
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 77ccd8e71..25d2dbc69 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 @@
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 8ffe85eab..cc09ac825 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.

- <@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. 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 4df1ea985..0076d9f15 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 @@ - + 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 938c76132..189fdc5df 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 @@

Languages

  • - + en English
  • - + es Espanol 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 907c1b67c..056b89fc7 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 @@

    Languages

    • - + en English
    • - + es Espanol 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 10f2e8734..fa0b7b0c1 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:
Name Value
    <#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 name="actionName">${name} 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 553f57f67..18ee1a62f 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 @@ -->
    Configuration
    -
    <@s.url id="constantsLink" action="showConstants" includeParams="none" /> +
    <@s.url var="constantsLink" action="showConstants" includeParams="none" /> Constants
    -
    <@s.url id="beansLink" action="showBeans" includeParams="none" /> +
    <@s.url var="beansLink" action="showBeans" includeParams="none" /> Beans
    -
    <@s.url id="jarsLink" action="showJars" includeParams="none" /> +
    <@s.url var="jarsLink" action="showJars" includeParams="none" /> Jars (requires Maven 2 data)
    @@ -80,7 +80,7 @@
    Actions in <#if namespace == ""> default <#else> ${namespace}
    <#foreach name in actionNames>
    - <@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 name="actionName">${name} 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 400d63650..42e0934f4 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 @@
-<@s.url id="url" action="showConfig" includeParams="none"> +<@s.url var="url" action="showConfig" includeParams="none"> <@s.param name="namespace">${namespace} <@s.param name="actionName">${actionName} 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 860c50984..4bb4d420a 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 @@ ${caption}

${message} <#if errors?exists> - <@s.iterator id="e" value="errors"> + <@s.iterator var="e" value="errors"> <#assign e = stack.findString('top') /> <#call error(e)>