You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/10/13 19:46:39 UTC
[1/2] struts git commit: WW-2891 Cleans up poms and update Freemarker
to the latest available version
Repository: struts
Updated Branches:
refs/heads/master ed1b8cc7b -> 617bfd23d
WW-2891 Cleans up poms and update Freemarker to the latest available version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/617bfd23
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/617bfd23
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/617bfd23
Branch: refs/heads/master
Commit: 617bfd23d9deaa1b0e8783964f8d010ff83d7eb9
Parents: 692e763
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Oct 13 19:46:06 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Oct 13 19:46:30 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 65 +++++++++++++++++++++++++++++++++++--------------------
pom.xml | 3 ++-
2 files changed, 43 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/617bfd23/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e87a4a4..2f78ca7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,32 +42,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
<configuration>
- <compilerArgs>
- <arg>-Auri=/struts-tags</arg>
- <arg>-AtlibVersion=${tlib.version}</arg>
- <arg>-AjspVersion=2.0</arg>
- <arg>-AshortName=s</arg>
- <arg>-AdisplayName=Struts Tags</arg>
- <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
- <arg>-Adescription="To make it easier to access dynamic data;
- the Apache Struts framework includes a library of custom tags.
- The tags interact with the framework's validation and
- internationalization features;
- to ensure that input is correct and output is localized.
- The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
- <arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
- </compilerArgs>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -130,6 +108,45 @@
<profiles>
<profile>
+ <id>build-maven</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs>
+ <arg>-Auri=/struts-tags</arg>
+ <arg>-AtlibVersion=${tlib.version}</arg>
+ <arg>-AjspVersion=2.0</arg>
+ <arg>-AshortName=s</arg>
+ <arg>-AdisplayName=Struts Tags</arg>
+ <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
+ <arg>-Adescription="To make it easier to access dynamic data;
+ the Apache Struts framework includes a library of custom tags.
+ The tags interact with the framework's validation and
+ internationalization features;
+ to ensure that input is correct and output is localized.
+ The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
+ <arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
+ </compilerArgs>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>alljars</id>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/struts/blob/617bfd23/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 16bf852..8afd9ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -455,7 +456,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.22</version>
+ <version>2.3.23</version>
</dependency>
<dependency>
[2/2] struts git commit: WW-2891 Replaces deprecated Freemarker's
operators
Posted by lu...@apache.org.
WW-2891 Replaces deprecated Freemarker's operators
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/692e763e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/692e763e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/692e763e
Branch: refs/heads/master
Commit: 692e763e4391169a06bb832a0fec5a42f16534fc
Parents: ed1b8cc
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Oct 13 19:45:33 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Oct 13 19:46:30 2015 +0200
----------------------------------------------------------------------
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 2 +-
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 2 +-
.../actionPrefix/redirectActionPrefix.ftl | 2 +-
.../resources/template/css_xhtml/checkbox.ftl | 14 ++++----
.../template/css_xhtml/controlfooter.ftl | 6 ++--
.../template/css_xhtml/controlheader-core.ftl | 8 ++---
.../template/css_xhtml/controlheader.ftl | 2 +-
.../template/css_xhtml/form-validate.ftl | 2 +-
.../main/resources/template/css_xhtml/reset.ftl | 4 +--
.../template/css_xhtml/submit-close.ftl | 2 +-
.../resources/template/css_xhtml/submit.ftl | 2 +-
.../main/resources/template/simple/a-close.ftl | 4 +--
.../resources/template/simple/actionerror.ftl | 4 +--
.../resources/template/simple/actionmessage.ftl | 4 +--
.../resources/template/simple/checkboxlist.ftl | 6 ++--
.../main/resources/template/simple/combobox.ftl | 10 +++---
.../main/resources/template/simple/debug.ftl | 4 +--
.../resources/template/simple/doubleselect.ftl | 6 ++--
.../resources/template/simple/form-close.ftl | 12 +++----
.../template/simple/optiontransferselect.ftl | 36 ++++++++++----------
.../resources/template/simple/submit-close.ftl | 2 +-
.../main/resources/template/simple/token.ftl | 4 +--
.../resources/template/simple/updownselect.ftl | 12 +++----
.../main/resources/template/xhtml/checkbox.ftl | 22 ++++++------
.../main/resources/template/xhtml/control.ftl | 2 +-
.../resources/template/xhtml/controlfooter.ftl | 4 +--
.../template/xhtml/controlheader-core.ftl | 12 +++----
.../resources/template/xhtml/form-close.ftl | 2 +-
.../resources/template/xhtml/form-validate.ftl | 2 +-
core/src/main/resources/template/xhtml/form.ftl | 4 +--
.../main/resources/template/xhtml/tooltip.ftl | 4 +--
.../resources/config-browser/showConfig.ftl | 2 +-
32 files changed, 102 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
index 412e370..0faa3a9 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
@@ -13,7 +13,7 @@
<p>You have come to this page because you used an <strong>action</strong> prefix.<p/>
- <p>The text you've entered is ${text?default('')?html}<p/>
+ <p>The text you've entered is ${text!''?html}<p/>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</...@s.a>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
index 702ca71..744f7fa 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
@@ -13,7 +13,7 @@
<p>You have come to this page because you used an <strong>method</strong> prefix.<p/>
- <p>The text you've enter is ${text?default('')?html}<p/>
+ <p>The text you've enter is ${text!''?html}<p/>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</...@s.a>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
----------------------------------------------------------------------
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
index f0bd957..4dd06d7 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
+++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
@@ -16,7 +16,7 @@
<p>Because this is a <strong>redirect-action</strong>, the text will be lost, due to a redirection
implies a new request being issued from the client.<p/>
- The text you've enter is ${text?default('')?html}<p/>
+ The text you've enter is ${text!''?html}<p/>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</...@s.a>
</div>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/checkbox.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/checkbox.ftl b/core/src/main/resources/template/css_xhtml/checkbox.ftl
index 004f674..c89f764 100644
--- a/core/src/main/resources/template/css_xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/css_xhtml/checkbox.ftl
@@ -46,7 +46,7 @@ lables
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("") == 'left'>
+<#if labelpos!"" == 'left'>
<span <#rt/>
<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl">
<label<#t/>
@@ -62,26 +62,26 @@ lables
</span>
</#if>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
</#if>
<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl">
-<#if parameters.required?default(false)>
+<#if parameters.required!false>
<span class="required">*</span><#t/>
</#if>
<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
-<#if labelpos?default("") != 'left'>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"") != 'left'>
+<#if (labelpos!"top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
</#if>
<#if parameters.label??>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -100,7 +100,7 @@ lables
</#if>
</#if>
<#if parameters.label??>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/controlfooter.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/controlfooter.ftl b/core/src/main/resources/template/css_xhtml/controlfooter.ftl
index 2783a0b..fef73ce 100644
--- a/core/src/main/resources/template/css_xhtml/controlfooter.ftl
+++ b/core/src/main/resources/template/css_xhtml/controlfooter.ftl
@@ -20,19 +20,19 @@
* under the License.
*/
-->
-${parameters.after?if_exists}<#t/>
+${parameters.after!}<#t/>
<#lt/>
<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
<#assign labelpos = parameters.form.labelposition/>
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
</div> <#rt/>
<#else>
</span> <#rt/>
</#if>
-<#if parameters.errorposition?default("top") == 'bottom'>
+<#if (parameters.errorposition!"top") == 'bottom'>
<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
<#if hasFieldErrors>
<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
index 2a5c98b..0c93113 100644
--- a/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
+++ b/core/src/main/resources/template/css_xhtml/controlheader-core.ftl
@@ -27,7 +27,7 @@
<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp">
-<#if parameters.errorposition?default("top") == 'top'>
+<#if (parameters.errorposition!"top") == 'top'>
<#if hasFieldErrors>
<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr">
<#list fieldErrors[parameters.name] as error>
@@ -49,7 +49,7 @@
<#assign labelpos = parameters.labelposition/>
</#if>
<#if parameters.label??>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -65,13 +65,13 @@
class="label"<#t/>
</#if>
><#t/>
-<#if parameters.required?default(false)>
+<#if parameters.required!false>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}${parameters.labelseparator!":"?html}
<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</label><#t/>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
</div> <br /><#rt/>
<#else>
</span> <#rt/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/controlheader.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/controlheader.ftl b/core/src/main/resources/template/css_xhtml/controlheader.ftl
index 9e47377..bc27a67 100644
--- a/core/src/main/resources/template/css_xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/css_xhtml/controlheader.ftl
@@ -26,7 +26,7 @@
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/form-validate.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/form-validate.ftl b/core/src/main/resources/template/css_xhtml/form-validate.ftl
index e62cd8d..dac513e 100644
--- a/core/src/main/resources/template/css_xhtml/form-validate.ftl
+++ b/core/src/main/resources/template/css_xhtml/form-validate.ftl
@@ -20,7 +20,7 @@
* under the License.
*/
-->
-<#if parameters.validate?default(false) == true>
+<#if parameters.validate!false == true>
<script type="text/javascript" src="${base}/struts/css_xhtml/validation.js"></script>
<#if parameters.onsubmit??>
${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")}
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/reset.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/reset.ftl b/core/src/main/resources/template/css_xhtml/reset.ftl
index 9c3a40a..8cb50a9 100644
--- a/core/src/main/resources/template/css_xhtml/reset.ftl
+++ b/core/src/main/resources/template/css_xhtml/reset.ftl
@@ -25,7 +25,7 @@
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
@@ -36,7 +36,7 @@
</#if>
><#t/>
<#include "/${parameters.templateDir}/simple/reset.ftl" />
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
</div> <#t/>
<#else>
</span> <#t/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/submit-close.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/submit-close.ftl b/core/src/main/resources/template/css_xhtml/submit-close.ftl
index 15c608a..c275e4d 100644
--- a/core/src/main/resources/template/css_xhtml/submit-close.ftl
+++ b/core/src/main/resources/template/css_xhtml/submit-close.ftl
@@ -4,7 +4,7 @@
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
</div> <#t/>
<#else>
</span> <#t/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/css_xhtml/submit.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/submit.ftl b/core/src/main/resources/template/css_xhtml/submit.ftl
index 1611ffb..d717325 100644
--- a/core/src/main/resources/template/css_xhtml/submit.ftl
+++ b/core/src/main/resources/template/css_xhtml/submit.ftl
@@ -25,7 +25,7 @@
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("top") == 'top'>
+<#if (labelpos!"top") == 'top'>
<div <#rt/>
<#else>
<span <#rt/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/a-close.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/a-close.ftl b/core/src/main/resources/template/simple/a-close.ftl
index 84b5aae..f2f58e6 100644
--- a/core/src/main/resources/template/simple/a-close.ftl
+++ b/core/src/main/resources/template/simple/a-close.ftl
@@ -21,10 +21,10 @@
*/
-->
<a<#rt/>
-<#if parameters.id?if_exists != "">
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
-<#if parameters.href?if_exists != "">
+<#if parameters.href??>
href="${parameters.href}"<#rt/>
</#if>
<#if parameters.tabindex??>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/actionerror.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/actionerror.ftl b/core/src/main/resources/template/simple/actionerror.ftl
index 6563876..6164a44 100644
--- a/core/src/main/resources/template/simple/actionerror.ftl
+++ b/core/src/main/resources/template/simple/actionerror.ftl
@@ -22,7 +22,7 @@
-->
<#if (actionErrors?? && actionErrors?size > 0)>
<ul<#rt/>
-<#if parameters.id?if_exists != "">
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#if parameters.cssClass??>
@@ -35,7 +35,7 @@
</#if>
>
<#list actionErrors as error>
- <#if error?if_exists != "">
+ <#if error??>
<li><span><#if parameters.escape>${error!?html}<#else>${error!}</#if></span><#rt/></li><#rt/>
</#if>
</#list>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/actionmessage.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/actionmessage.ftl b/core/src/main/resources/template/simple/actionmessage.ftl
index 07174dd..f5b02e5 100644
--- a/core/src/main/resources/template/simple/actionmessage.ftl
+++ b/core/src/main/resources/template/simple/actionmessage.ftl
@@ -22,7 +22,7 @@
-->
<#if (actionMessages?? && actionMessages?size > 0 && !parameters.isEmptyList)>
<ul<#rt/>
-<#if parameters.id?if_exists != "">
+<#if parameters.id??>
id="${parameters.id?html}"<#rt/>
</#if>
<#if parameters.cssClass??>
@@ -35,7 +35,7 @@
</#if>
>
<#list actionMessages as message>
- <#if message?if_exists != "">
+ <#if message??>
<li><span><#if parameters.escape>${message!?html}<#else>${message!}</#if></span></li>
</#if>
</#list>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/checkboxlist.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/checkboxlist.ftl b/core/src/main/resources/template/simple/checkboxlist.ftl
index d50a98f..4f262ec 100644
--- a/core/src/main/resources/template/simple/checkboxlist.ftl
+++ b/core/src/main/resources/template/simple/checkboxlist.ftl
@@ -72,21 +72,21 @@
<#if parameters.disabled!false>
disabled="disabled"<#rt/>
</#if>
- <#if itemCssClass! != "">
+ <#if itemCssClass??>
class="${itemCssClass?html}"<#rt/>
<#else>
<#if parameters.cssClass?has_content>
class="${parameters.cssClass?html}"<#rt/>
</#if>
</#if>
- <#if itemCssStyle! != "">
+ <#if itemCssStyle??>
style="${itemCssStyle?html}"<#rt/>
<#else>
<#if parameters.cssStyle?has_content>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
</#if>
- <#if itemTitle! != "">
+ <#if itemTitle??>
title="${itemTitle?html}"<#rt/>
<#else>
<#if parameters.title?has_content>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/combobox.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl
index 760ad71..a9ef547 100644
--- a/core/src/main/resources/template/simple/combobox.ftl
+++ b/core/src/main/resources/template/simple/combobox.ftl
@@ -40,14 +40,14 @@
<#if parameters.list??>
<select onChange="autoPopulate_${parameters.escapedId?html}(this);"<#rt/>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
- <#if parameters.disabled?default(false)>
+ <#if parameters.disabled!false>
disabled="disabled"<#rt/>
</#if>
>
<#if (parameters.headerKey?? && parameters.headerValue??)>
<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
</#if>
- <#if parameters.emptyOption?default(false)>
+ <#if parameters.emptyOption!false>
<option value=""></option>
</#if>
<@s.iterator value="parameters.list">
@@ -86,13 +86,13 @@
<#if (parameters.nameValue == tmpListKey)>
selected="selected"<#rt/>
</#if>
- <#if itemCssClass?if_exists != "">
+ <#if itemCssClass??>
class="${itemCssClass?html}"<#rt/>
</#if>
- <#if itemCssStyle?if_exists != "">
+ <#if itemCssStyle??>
style="${itemCssStyle?html}"<#rt/>
</#if>
- <#if itemTitle?if_exists != "">
+ <#if itemTitle??>
title="${itemTitle?html}"<#rt/>
</#if>
><#t/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/debug.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/debug.ftl b/core/src/main/resources/template/simple/debug.ftl
index 492ee76..a67b7fa 100644
--- a/core/src/main/resources/template/simple/debug.ftl
+++ b/core/src/main/resources/template/simple/debug.ftl
@@ -44,8 +44,8 @@
</style>
<br>
-<a href="#" onclick="toggleDebug('<#if parameters.id?if_exists != "">${parameters.id?html}<#else>debug</#if>');return false;">[Debug]</a>
-<div style="display:none" id="<#if parameters.id?if_exists != "">${parameters.id?html}<#else>debug</#if>">
+<a href="#" onclick="toggleDebug('<#if parameters.id??>${parameters.id?html}<#else>debug</#if>');return false;">[Debug]</a>
+<div style="display:none" id="<#if parameters.id??>${parameters.id?html}<#else>debug</#if>">
<h2>Struts ValueStack Debug</h2>
<br>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/doubleselect.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl
index 5485755..23b1ab8 100644
--- a/core/src/main/resources/template/simple/doubleselect.ftl
+++ b/core/src/main/resources/template/simple/doubleselect.ftl
@@ -133,13 +133,13 @@
</#if>
</#if>
${parameters.id}Group[${itemCount}][${doubleItemCount}] = new Option("${doubleItemValue?js_string}", "${doubleItemKeyStr?js_string}");
- <#if itemDoubleCssClass! != "">
+ <#if itemDoubleCssClass??>
${parameters.id}Group[${itemCount}][${doubleItemCount}].setAttribute("class","${itemDoubleCssClass?html}");
</#if>
- <#if itemDoubleCssStyle! != "">
+ <#if itemDoubleCssStyle??>
${parameters.id}Group[${itemCount}][${doubleItemCount}].setAttribute("style","${itemDoubleCssStyle?html}");
</#if>
- <#if itemDoubleTitle! != "">
+ <#if itemDoubleTitle??>
${parameters.id}Group[${itemCount}][${doubleItemCount}].setAttribute("title","${itemDoubleTitle?html}");
</#if>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/form-close.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/form-close.ftl b/core/src/main/resources/template/simple/form-close.ftl
index 360eef9..14b99cb 100644
--- a/core/src/main/resources/template/simple/form-close.ftl
+++ b/core/src/main/resources/template/simple/form-close.ftl
@@ -22,13 +22,13 @@
-->
</form>
-<#if (parameters.customOnsubmitEnabled?if_exists)>
+<#if (parameters.customOnsubmitEnabled??)>
<script type="text/javascript">
<#--
Enable auto-select of optiontransferselect tag's entries upon containing form's
submission.
-->
-<#if (parameters.optiontransferselectIds?if_exists?size > 0)>
+<#if (parameters.optiontransferselectIds!?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign selectObjIds = parameters.optiontransferselectIds.keySet() />
<#list selectObjIds as selectObjectId>
@@ -44,7 +44,7 @@
}, true);
</#list>
</#if>
-<#if (parameters.inputtransferselectIds?if_exists?size > 0)>
+<#if (parameters.inputtransferselectIds!?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign selectObjIds = parameters.inputtransferselectIds.keySet() />
<#list selectObjIds as selectObjectId>
@@ -60,7 +60,7 @@
}, true);
</#list>
</#if>
-<#if (parameters.optiontransferselectDoubleIds?if_exists?size > 0)>
+<#if (parameters.optiontransferselectDoubleIds!?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign selectDoubleObjIds = parameters.optiontransferselectDoubleIds.keySet() />
<#list selectDoubleObjIds as selectObjId>
@@ -82,7 +82,7 @@
Enable auto-select of all elements of updownselect tag upon its containing form
submission
-->
-<#if (parameters.updownselectIds?if_exists?size > 0)>
+<#if (parameters.updownselectIds!?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign tmpIds = parameters.updownselectIds.keySet() />
<#list tmpIds as tmpId>
@@ -105,7 +105,7 @@
<#--
Code that will add javascript needed for tooltips
--><#t/>
-<#if (parameters.hasTooltip?default(false))><#t/>
+<#if (parameters.hasTooltip!false)><#t/>
<#lt/><!-- javascript that is needed for tooltips -->
<#lt/><script type="text/javascript" src='<@s.url value="/struts/domTT.js" includeParams="none" encode="false" />'></script>
<#lt/><link rel="stylesheet" type="text/css" href="<@s.url value="/struts/domTT.css" includeParams="none" encode="false" />"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/optiontransferselect.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl
index c685956..67b5f2c 100644
--- a/core/src/main/resources/template/simple/optiontransferselect.ftl
+++ b/core/src/main/resources/template/simple/optiontransferselect.ftl
@@ -31,7 +31,7 @@
<label for="leftTitle">${parameters.leftTitle}</label><br />
</#if><#t/>
<#include "/${parameters.templateDir}/simple/select.ftl" />
-<#if parameters.allowUpDownOnLeft?default(true)>
+<#if parameters.allowUpDownOnLeft!true>
<input type="button"
onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', <#if parameters.headerKey??>'${parameters.headerKey}'<#else>''</#if>);<#if parameters.upDownOnLeftOnclick?has_content>${parameters.upDownOnLeftOnclick};</#if>"
<#if parameters.leftDownLabel??>
@@ -48,8 +48,8 @@
</td>
<td class="tdTransferSelect">
- <#if parameters.allowAddToLeft?default(true)><#t/>
- <#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/>
+ <#if parameters.allowAddToLeft!true><#t/>
+ <#assign addToLeftLabel = parameters.addToLeftLabel!"<-"?html/><#t/>
<#if parameters.doubleHeaderKey??><#t/>
<input type="button"
<#if parameters.buttonCssClass??><#t/>
@@ -70,8 +70,8 @@
value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '');<#if parameters.addToLeftOnclick?has_content>${parameters.addToLeftOnclick};</#if>" /><br /><br />
</#if><#t/>
</#if><#t/>
- <#if parameters.allowAddToRight?default(true)><#t/>
- <#assign addToRightLabel=parameters.addToRightLabel?default("->")?html /><#t/>
+ <#if parameters.allowAddToRight!true><#t/>
+ <#assign addToRightLabel=parameters.addToRightLabel!"->"?html /><#t/>
<#if parameters.headerKey??><#t/>
<input type="button"
<#if parameters.buttonCssClass??><#t/>
@@ -92,8 +92,8 @@
value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '');<#if parameters.addToRightOnclick?has_content>${parameters.addToRightOnclick};</#if>" /><br /><br />
</#if><#t/>
</#if><#t/>
- <#if parameters.allowAddAllToLeft?default(true)><#t/>
- <#assign addAllToLeftLabel=parameters.addAllToLeftLabel?default("<<--")?html /><#t/>
+ <#if parameters.allowAddAllToLeft!true><#t/>
+ <#assign addAllToLeftLabel=parameters.addAllToLeftLabel!"<<--"?html /><#t/>
<#if parameters.doubleHeaderKey??><#t/>
<input type="button"
<#if parameters.buttonCssClass??><#t/>
@@ -114,8 +114,8 @@
value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '');<#if parameters.addAllToLeftOnclick?has_content>${parameters.addAllToLeftOnclick};</#if>" /><br /><br />
</#if><#t/>
</#if><#t/>
- <#if parameters.allowAddAllToRight?default(true)><#t/>
- <#assign addAllToRightLabel=parameters.addAllToRightLabel?default("-->>")?html /><#t/>
+ <#if parameters.allowAddAllToRight!true><#t/>
+ <#assign addAllToRightLabel=parameters.addAllToRightLabel!"-->>"?html /><#t/>
<#if parameters.headerKey??><#t/>
<input type="button"
<#if parameters.buttonCssClass??><#t/>
@@ -136,8 +136,8 @@
value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '');<#if parameters.addAllToRightOnclick?has_content>${parameters.addAllToRightOnclick};</#if>" /><br /><br />
</#if><#t/>
</#if><#t/>
- <#if parameters.allowSelectAll?default(true)><#t/>
- <#assign selectAllLabel=parameters.selectAllLabel?default("<*>")?html /><#t/>
+ <#if parameters.allowSelectAll!true><#t/>
+ <#assign selectAllLabel=parameters.selectAllLabel!"<*>"?html /><#t/>
<#if parameters.headerKey?? && parameters.doubleHeaderKey??><#t/>
<input type="button"
<#if parameters.buttonCssClass??><#t/>
@@ -182,14 +182,14 @@
<label for="rightTitle">${parameters.rightTitle}</label><br />
</#if><#t/>
<select
- name="${parameters.doubleName?default("")?html}"
+ name="${parameters.doubleName!""?html}"
<#if parameters.get("doubleSize")??><#t/>
size="${parameters.get("doubleSize")?html}"
</#if><#t/>
- <#if parameters.doubleDisabled?default(false)><#t/>
+ <#if parameters.doubleDisabled!false><#t/>
disabled="disabled"
</#if><#t/>
- <#if parameters.doubleMultiple?default(false)><#t/>
+ <#if parameters.doubleMultiple!false><#t/>
multiple="multiple"
</#if><#t/>
<#if parameters.doubleTabindex??><#t/>
@@ -253,7 +253,7 @@
<#if parameters.doubleHeaderKey?? && parameters.doubleHeaderValue??><#t/>
<option value="${parameters.doubleHeaderKey?html}">${parameters.doubleHeaderValue?html}</option>
</#if><#t/>
- <#if parameters.doubleEmptyOption?default(false)><#t/>
+ <#if parameters.doubleEmptyOption!false><#t/>
<option value=""></option>
</#if><#t/>
<@s.iterator value="parameters.doubleList"><#t/>
@@ -275,14 +275,14 @@
>${doubleItemValue?html}</option><#lt/>
</...@s.iterator><#t/>
</select>
-<#if parameters.doubleMultiple?default(false)>
+<#if parameters.doubleMultiple!false>
<input type="hidden" id="__multiselect_${parameters.doubleId?html}" name="__multiselect_${parameters.doubleName?default("")?html}" value=""<#rt/>
-<#if parameters.doubleDisabled?default(false)>
+<#if parameters.doubleDisabled!false>
disabled="disabled"<#rt/>
</#if>
/>
</#if>
-<#if parameters.allowUpDownOnRight?default(true)>
+<#if parameters.allowUpDownOnRight!true>
<input type="button"
onclick="moveOptionDown(document.getElementById('${parameters.doubleId}'), 'key', <#if parameters.doubleHeaderKey??>'${parameters.doubleHeaderKey}'<#else>''</#if>);<#if parameters.upDownOnRightOnclick?has_content>${parameters.upDownOnRightOnclick};</#if>"
<#if parameters.rightDownLabel??>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/submit-close.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/submit-close.ftl b/core/src/main/resources/template/simple/submit-close.ftl
index 7f51958..c16ac6e 100644
--- a/core/src/main/resources/template/simple/submit-close.ftl
+++ b/core/src/main/resources/template/simple/submit-close.ftl
@@ -1,5 +1,5 @@
<#if parameters.type?? && parameters.type=="button">
-<#if (parameters.body)?default("")?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/></#if>
+<#if parameters.body?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/></#if>
</button>
<#else>
${parameters.body}<#rt/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/token.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/token.ftl b/core/src/main/resources/template/simple/token.ftl
index cabfa9c..18131cf 100644
--- a/core/src/main/resources/template/simple/token.ftl
+++ b/core/src/main/resources/template/simple/token.ftl
@@ -20,5 +20,5 @@
* under the License.
*/
-->
-<input type="hidden" name="${parameters.tokenNameField?default("")}" value="${parameters.name?default("")?html}" />
-<input type="hidden" name="${parameters.name?default("")}" value="${parameters.token?default("")?html}" />
\ No newline at end of file
+<input type="hidden" name="${parameters.tokenNameField!""}" value="${parameters.name!""?html}" />
+<input type="hidden" name="${parameters.name!""}" value="${parameters.token!""?html}" />
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/simple/updownselect.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/updownselect.ftl b/core/src/main/resources/template/simple/updownselect.ftl
index 30128ef..bc741ad 100644
--- a/core/src/main/resources/template/simple/updownselect.ftl
+++ b/core/src/main/resources/template/simple/updownselect.ftl
@@ -29,24 +29,24 @@
<#include "/${templateDir}/simple/select.ftl" /><#t/>
</td></tr>
<tr><td>
-<#if parameters.allowMoveUp?default(true)><#t/>
- <#assign defMoveUpLabel="${parameters.moveUpLabel?default('^')}" /><#t/>
+<#if parameters.allowMoveUp!true><#t/>
+ <#assign defMoveUpLabel="${parameters.moveUpLabel!'^'}" /><#t/>
<#if parameters.headerKey??><#t/>
<input type="button" value="${defMoveUpLabel}" onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />
<#else><#t/>
<input type="button" value="${defMoveUpLabel}" onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '');" />
</#if><#t/>
</#if><#t/>
-<#if parameters.allowMoveDown?default(true)><#t/>
- <#assign defMoveDownLabel="${parameters.moveDownLabel?default('v')}" /><#t/>
+<#if parameters.allowMoveDown!true><#t/>
+ <#assign defMoveDownLabel="${parameters.moveDownLabel!'v'}" /><#t/>
<#if parameters.headerKey??><#t/>
<input type="button" value="${defMoveDownLabel}" onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />
<#else><#t/>
<input type="button" value="${defMoveDownLabel}" onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '');" />
</#if><#t/>
</#if><#t/>
-<#if parameters.allowSelectAll?default(true)><#t/>
- <#assign defSelectAllLabel="${parameters.selectAllLabel?default('*')}" /><#t/>
+<#if parameters.allowSelectAll!true><#t/>
+ <#assign defSelectAllLabel="${parameters.selectAllLabel!'*'}" /><#t/>
<#if parameters.headerKey??><#t/>
<input type="button" value="${defSelectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />
<#else><#t/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/checkbox.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl
index d845065..7791dfe 100644
--- a/core/src/main/resources/template/xhtml/checkbox.ftl
+++ b/core/src/main/resources/template/xhtml/checkbox.ftl
@@ -39,7 +39,7 @@
<#elseif parameters.labelposition??>
<#assign labelpos = parameters.labelposition/>
</#if>
-<#if labelpos?default("") == 'top'>
+<#if (labelpos!"") == 'top'>
<tr>
<td colspan="2">
<#if parameters.label??> <label<#t/>
@@ -52,11 +52,11 @@
class="checkboxLabel"<#rt/>
</#if>
>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'>
<span class="required">*</span><#t/>
</#if>
:<#t/>
@@ -73,7 +73,7 @@ ${parameters.label?html}<#t/>
<#else>
<tr>
<td class="tdCheckboxLabel">
-<#if labelpos?default("") == 'left'>
+<#if (labelpos!"") == 'left'>
<#if parameters.label??> <label<#t/>
<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
@@ -84,11 +84,11 @@ ${parameters.label?html}<#t/>
class="checkboxLabel"<#rt/>
</#if>
>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'>
<span class="required">*</span><#t/>
</#if>
:<#t/>
@@ -98,8 +98,8 @@ ${parameters.label?html}<#t/>
</label><#t/>
</#if>
</#if>
-<#if labelpos?default("") == 'right'>
- <#if parameters.required?default(false)>
+<#if (labelpos!"") == 'right'>
+ <#if parameters.required!false>
<span class="required">*</span><#t/>
</#if>
<#if parameters.tooltip??>
@@ -109,10 +109,10 @@ ${parameters.label?html}<#t/>
</td>
<td class="tdCheckboxInput">
-<#if labelpos?default("") != 'top'>
- <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
+<#if (labelpos!"") != 'top'>
+ <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
</#if>
-<#if labelpos?default("") != 'top' && labelpos?default("") != 'left'>
+<#if (labelpos!"") != 'top' && (labelpos!"") != 'left'>
<#if parameters.label??> <label<#t/>
<#if parameters.id??>
for="${parameters.id?html}"<#rt/>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/control.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/control.ftl b/core/src/main/resources/template/xhtml/control.ftl
index 2761ac3..06cb89e 100644
--- a/core/src/main/resources/template/xhtml/control.ftl
+++ b/core/src/main/resources/template/xhtml/control.ftl
@@ -20,7 +20,7 @@
* under the License.
*/
-->
-<table class="${parameters.cssClass?default('wwFormTable')?html}"<#rt/>
+<table class="${parameters.cssClass!'wwFormTable'?html}"<#rt/>
<#if parameters.cssStyle??> style="${parameters.cssStyle?html}"<#rt/>
</#if>
>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/controlfooter.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/controlfooter.ftl b/core/src/main/resources/template/xhtml/controlfooter.ftl
index ef3f3ca..16d4a10 100644
--- a/core/src/main/resources/template/xhtml/controlfooter.ftl
+++ b/core/src/main/resources/template/xhtml/controlfooter.ftl
@@ -20,10 +20,10 @@
* under the License.
*/
-->
-${parameters.after?if_exists}<#t/>
+${parameters.after!}<#t/>
</td><#lt/>
</tr>
-<#if parameters.errorposition?default("top") == 'bottom'>
+<#if (parameters.errorposition!"top") == 'bottom'>
<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
<#if hasFieldErrors>
<#list fieldErrors[parameters.name] as error>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/controlheader-core.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl
index 5835a84..302442d 100644
--- a/core/src/main/resources/template/xhtml/controlheader-core.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl
@@ -25,7 +25,7 @@
This will be done if ActionSupport is used.
-->
<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
-<#if parameters.errorposition?default("top") == 'top'>
+<#if (parameters.errorposition!"top") == 'top'>
<#if hasFieldErrors>
<#list fieldErrors[parameters.name] as error>
<tr errorFor="${parameters.id}">
@@ -46,7 +46,7 @@
then give the label it's own row in the table
-->
<tr>
-<#if labelpos?default("") == 'top'>
+<#if (labelpos!"") == 'top'>
<td class="tdLabelTop" colspan="2"><#rt/>
<#else>
<td class="tdLabel"><#rt/>
@@ -62,20 +62,20 @@
class="label"<#t/>
</#if>
><#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" != 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
+<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'>
<span class="required">*</span><#t/>
</#if>
-${parameters.labelseparator?default(":")?html}<#t/>
+${parameters.labelseparator!":"?html}<#t/>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
</label><#t/>
</#if>
</td><#lt/>
<#-- add the extra row -->
-<#if labelpos?default("") == 'top'>
+<#if (labelpos!"") == 'top'>
</tr>
<tr>
</#if>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/form-close.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/form-close.ftl b/core/src/main/resources/template/xhtml/form-close.ftl
index d783454..aca4236 100644
--- a/core/src/main/resources/template/xhtml/form-close.ftl
+++ b/core/src/main/resources/template/xhtml/form-close.ftl
@@ -23,7 +23,7 @@
<#include "/${parameters.templateDir}/${parameters.expandTheme}/control-close.ftl" />
<#include "/${parameters.templateDir}/simple/form-close.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl" />
-<#if parameters.focusElement?if_exists != "">
+<#if parameters.focusElement??>
<script type="text/javascript">
StrutsUtils.addOnLoad(function() {
var element = document.getElementById("${parameters.focusElement?html}");
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/form-validate.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/form-validate.ftl b/core/src/main/resources/template/xhtml/form-validate.ftl
index 6597f4e..32556ca 100644
--- a/core/src/main/resources/template/xhtml/form-validate.ftl
+++ b/core/src/main/resources/template/xhtml/form-validate.ftl
@@ -20,7 +20,7 @@
* under the License.
*/
-->
-<#if parameters.validate?default(false) == true>
+<#if parameters.validate!false == true>
<script type="text/javascript" src="${base}/struts/xhtml/validation.js"></script>
<script type="text/javascript" src="${base}/struts/utils.js"></script>
<#if parameters.onsubmit??>
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/form.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/form.ftl b/core/src/main/resources/template/xhtml/form.ftl
index 5a686dd..cce99cc 100644
--- a/core/src/main/resources/template/xhtml/form.ftl
+++ b/core/src/main/resources/template/xhtml/form.ftl
@@ -22,8 +22,8 @@
-->
<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-validate.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-common.ftl" />
-<#if (parameters.validate?default(false))>
- onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}"
+<#if (parameters.validate!false)>
+ onreset="${parameters.onreset!'clearErrorMessages(this);clearErrorLabels(this);'}"
<#else>
<#if parameters.onreset??>
onreset="${parameters.onreset?html}"
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/core/src/main/resources/template/xhtml/tooltip.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/xhtml/tooltip.ftl b/core/src/main/resources/template/xhtml/tooltip.ftl
index 74938a8..862500f 100644
--- a/core/src/main/resources/template/xhtml/tooltip.ftl
+++ b/core/src/main/resources/template/xhtml/tooltip.ftl
@@ -27,12 +27,12 @@
<#else><#t/>
src='<@s.url value="/struts/tooltip.gif" includeParams="none" encode="false" />'
</#if><#t/>
- <#if parameters.jsTooltipEnabled?default('false') == 'true'>
+ <#if (parameters.jsTooltipEnabled!'false') == 'true'>
onmouseover="domTT_activate(this, event, 'content', '${parameters.tooltip}'<#t/>
<#if parameters.tooltipDelay??><#t/>
<#t/>,'delay', '${parameters.tooltipDelay}'<#t/>
</#if><#t/>
- <#t/>,'styleClass', '${parameters.tooltipCssClass?default("StrutsTTClassic")}'<#t/>
+ <#t/>,'styleClass', '${parameters.tooltipCssClass!"StrutsTTClassic"}'<#t/>
<#t/>)" />
<#else>
title="${parameters.tooltip?html}"
http://git-wip-us.apache.org/repos/asf/struts/blob/692e763e/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 34987a1..400d636 100644
--- a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
@@ -29,7 +29,7 @@
<tr><td>Action name:</td><td>${actionName}</td></tr>
<tr><td>Namespace:</td><td> ${namespace}</td></tr>
<tr><td>Action class:</td><td> ${config.className}</td></tr>
- <tr><td>Action method:</td><td> <#if config.methodName?exists>${config.methodName}</#if></td></tr>
+ <tr><td>Action method:</td><td> <#if config.methodName??>${config.methodName}</#if></td></tr>
<tr><td>Parameters:</td><td> <#list config.params?keys as p>
${p}
</#list></td></tr>