struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [04/16] struts-examples git commit: Unify artifact names and use "-" instead of "_"
Date Sun, 14 Jun 2015 10:53:16 GMT
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/form-close.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/form-close.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/form-close.ftl
deleted file mode 100644
index 360eef9..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/form-close.ftl
+++ /dev/null
@@ -1,113 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-</form>
-
-<#if (parameters.customOnsubmitEnabled?if_exists)>
-<script type="text/javascript">
-<#-- 
-  Enable auto-select of optiontransferselect tag's entries upon containing form's 
-  submission.
--->
-<#if (parameters.optiontransferselectIds?if_exists?size > 0)>
-	var containingForm = document.getElementById("${parameters.id}");
-	<#assign selectObjIds = parameters.optiontransferselectIds.keySet() />
-	<#list selectObjIds as selectObjectId>
-		StrutsUtils.addEventListener(containingForm, "submit", 
-			function(evt) {
-				var selectObj = document.getElementById("${selectObjectId}");
-				<#if parameters.optiontransferselectIds.get(selectObjectId)??>
-					<#assign selectTagHeaderKey = parameters.optiontransferselectIds.get(selectObjectId)/>
-					selectAllOptionsExceptSome(selectObj, "key", "${selectTagHeaderKey}");
-				<#else>
-					selectAllOptionsExceptSome(selectObj, "key", "");
-				</#if>
-			}, true);
-	</#list>
-</#if>
-<#if (parameters.inputtransferselectIds?if_exists?size > 0)>
-	var containingForm = document.getElementById("${parameters.id}");
-	<#assign selectObjIds = parameters.inputtransferselectIds.keySet() />
-	<#list selectObjIds as selectObjectId>
-		StrutsUtils.addEventListener(containingForm, "submit",
-			function(evt) {
-				var selectObj = document.getElementById("${selectObjectId}");
-				<#if parameters.inputtransferselectIds.get(selectObjectId)??>
-					<#assign selectTagHeaderKey = parameters.inputtransferselectIds.get(selectObjectId)/>
-					selectAllOptionsExceptSome(selectObj, "key", "${selectTagHeaderKey}");
-				<#else>
-					selectAllOptionsExceptSome(selectObj, "key", "");
-				</#if>
-			}, true);
-	</#list>
-</#if>
-<#if (parameters.optiontransferselectDoubleIds?if_exists?size > 0)>
-	var containingForm = document.getElementById("${parameters.id}");
-	<#assign selectDoubleObjIds = parameters.optiontransferselectDoubleIds.keySet() />
-	<#list selectDoubleObjIds as selectObjId>
-		StrutsUtils.addEventListener(containingForm, "submit", 
-			function(evt) {
-				var selectObj = document.getElementById("${selectObjId}");
-				<#if parameters.optiontransferselectDoubleIds.get(selectObjId)??>
-					<#assign selectTagHeaderKey = parameters.optiontransferselectDoubleIds.get(selectObjId)/>
-					selectAllOptionsExceptSome(selectObj, "key", "${selectTagHeaderKey}");
-				<#else>
-					selectAllOptionsExceptSome(selectObj, "key", "");
-				</#if>
-			}, true);
-	</#list>
-</#if>
-
-
-<#--
-	Enable auto-select of all elements of updownselect tag upon its containing form
-	submission
--->
-<#if (parameters.updownselectIds?if_exists?size > 0)>
-	var containingForm = document.getElementById("${parameters.id}");
-	<#assign tmpIds = parameters.updownselectIds.keySet() />
-	<#list tmpIds as tmpId>
-		StrutsUtils.addEventListener(containingForm, "submit", 
-			function(evt) {
-				var updownselectObj = document.getElementById("${tmpId}");
-				<#if parameters.updownselectIds.get(tmpId)??>
-					<#assign tmpHeaderKey = parameters.updownselectIds.get(tmpId) />
-					selectAllOptionsExceptSome(updownselectObj, "key", "${tmpHeaderKey}");
-				<#else>
-					selectAllOptionsExceptSome(updownselectObj, "key", "");
-				</#if>
-			}, true);
-	</#list>
-</#if>
-</script>
-</#if>
-
-
-<#-- 
- Code that will add javascript needed for tooltips
---><#t/>
-<#if (parameters.hasTooltip?default(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" />"/>
-	
-</#if><#t/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/form-common.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/form-common.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/form-common.ftl
deleted file mode 100644
index 9b46381..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/form-common.ftl
+++ /dev/null
@@ -1,67 +0,0 @@
-<#--
-/*
- * $Id: form.ftl 590812 2007-10-31 20:32:54Z apetrelli $
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if (parameters.validate?default(false) == false)><#rt/>
-    <#if parameters.onsubmit??><#rt/>
-        ${tag.addParameter('onsubmit', "${parameters.onsubmit}") }
-    </#if>
-</#if>
-<form<#rt/>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.name??>
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.onsubmit??>
- onsubmit="${parameters.onsubmit?html}"<#rt/>
-</#if>
-<#if parameters.onreset??>
- onreset="${parameters.onreset?html}"<#rt/>
-</#if>
-<#if parameters.action??>
- action="${parameters.action?html}"<#rt/>
-</#if>
-<#if parameters.target??>
- target="${parameters.target?html}"<#rt/>
-</#if>
-<#if parameters.method??>
- method="${parameters.method?html}"<#rt/>
-<#else>
- method="post"<#rt/>
-</#if>
-<#if parameters.enctype??>
- enctype="${parameters.enctype?html}"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.acceptcharset??>
- accept-charset="${parameters.acceptcharset?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/form.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/form.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/form.ftl
deleted file mode 100644
index f02eea9..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/form.ftl
+++ /dev/null
@@ -1,27 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/form-common.ftl" />
-<#if parameters.onreset??>
- onreset="${parameters.onreset?html}"<#rt/>
-</#if>
->

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/head.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/head.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/head.ftl
deleted file mode 100644
index 03c3940..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/head.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<script src="${base}/struts/utils.js" type="text/javascript"></script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/hidden.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/hidden.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/hidden.ftl
deleted file mode 100644
index 4f91237..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/hidden.ftl
+++ /dev/null
@@ -1,41 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<input type="hidden"<#rt/>
- name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.nameValue??>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/inputtransferselect.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/inputtransferselect.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/inputtransferselect.ftl
deleted file mode 100644
index 610eeb2..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/inputtransferselect.ftl
+++ /dev/null
@@ -1,124 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if !stack.findValue("#inputtransferselect_js_included")??><#t/>
-	<script type="text/javascript" src="<@s.url value="/struts/inputtransferselect.js" encode='false' includeParams='none'/>"></script>
-	<#assign temporaryVariable = stack.setValue("#inputtransferselect_js_included", "true") /><#t/>
-</#if><#t/>
-<table border="0">
-<tr>
-<td>
-<#if parameters.leftTitle??><#t/>
-	<label for="leftTitle">${parameters.leftTitle}</label><br />
-</#if><#t/>
-
-
-<input type="text"<#rt/>
- name="${parameters.name?default("")?html}_input"<#rt/>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.readonly?default(false)>
- readonly="readonly"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}_input"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-/>
-
-
-</td>
-<td valign="middle" align="center">
-	<#assign addLabel=parameters.addLabel?default("->")?html /><#t/>
-	<input type="button"
-		<#if parameters.buttonCssClass??><#t/>
-		 class="${parameters.buttonCssClass?html}"
-		</#if><#t/>
-		<#if parameters.buttonCssStyle??>
-		 style="${parameters.buttonCssStyle?html}"
-		</#if><#t/>
-		 value="${addLabel}" onclick="addOption(document.getElementById('${parameters.id?html}_input'), document.getElementById('${parameters.id?html}'))" /><br /><br />
-	<#t/>
-	<#assign removeLabel=parameters.removeLabel?default("<-")?html /><#t/>
-	<input type="button"
-  		<#if parameters.buttonCssClass??><#t/>
-		 class="${parameters.buttonCssClass?html}"
-		</#if><#t/>
-		<#if parameters.buttonCssStyle??>
-		 style="${parameters.buttonCssStyle?html}"
-		</#if><#t/>
-		 value="${removeLabel}" onclick="removeOptions(document.getElementById('${parameters.id?html}'))" /><br /><br />
-	<#t/>
-	<#assign removeAllLabel=parameters.removeAllLabel?default("<<--")?html /><#t/>
-	<input type="button"
-	    		<#if parameters.buttonCssClass??><#t/>
-		 class="${parameters.buttonCssClass?html}"
-		</#if><#t/>
-		<#if parameters.buttonCssStyle??>
-		 style="${parameters.buttonCssStyle?html}"
-		</#if><#t/>
-		 value="${removeAllLabel}" onclick="removeAllOptions(document.getElementById('${parameters.id?html}'))" /><br /><br />
-</td>
-<td>
-<#if parameters.rightTitle??><#t/>
-	<label for="rightTitle">${parameters.rightTitle}</label><br />
-</#if><#t/>
-<#include "/${parameters.templateDir}/simple/select.ftl" />
-<#if parameters.allowUpDown?default(true)>
-<input type="button" 
-<#if parameters.headerKey??>
-	onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');"
-<#else>
-	onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '');"
-</#if>
-<#if parameters.downLabel??>
-	value="${parameters.downLabel?html}"
-</#if>
-/>
-<input type="button" 
-<#if parameters.headerKey??>
-	onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');"
-<#else>
-	onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '');"
-</#if>
-<#if parameters.upLabel??>
-	value="${parameters.upLabel?html}"
-</#if>
-/>
-</#if>
-</td>
-</tr>
-</table>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/label.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/label.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/label.ftl
deleted file mode 100644
index 53524d4..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/label.ftl
+++ /dev/null
@@ -1,45 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<label<#rt/>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.for??>
- for="${parameters.for?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-><#rt/>
-<#if parameters.nameValue??>
-<@s.property value="parameters.nameValue"/><#t/>
-</#if>
-</label>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/optgroup.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/optgroup.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/optgroup.ftl
deleted file mode 100644
index 6d503b7..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/optgroup.ftl
+++ /dev/null
@@ -1,51 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if parameters.optGroupInternalListUiBeanList??>
-<#assign optGroupInternalListUiBeans=parameters.optGroupInternalListUiBeanList />
-<#list optGroupInternalListUiBeans as optGroupInternalListUiBean>
-<optgroup 
-	<#if optGroupInternalListUiBean.parameters.label??>
-	label="${optGroupInternalListUiBean.parameters.label}"
-	</#if>
-	<#if optGroupInternalListUiBean.parameters.disabled?default(false)>
-	disabled="disabled"
-	</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
->
-
-<#list optGroupInternalListUiBean.parameters.list as optGroupBean>
-<#assign trash=stack.push(optGroupBean) />
-	<#assign tmpKey=stack.findValue(optGroupInternalListUiBean.parameters.listKey) />
-	<#assign tmpValue=stack.findValue(optGroupInternalListUiBean.parameters.listValue) />
-	<#assign tmpKeyStr = tmpKey.toString() />
-	<option value="${tmpKeyStr?html}"
-	<#if tag.contains(parameters.nameValue, tmpKeyStr) == true>
-	selected="selected"
-	</#if>
-	>${tmpValue?html}
-	</option>
-<#assign trash=stack.pop() />
-</#list>
-</optgroup>
-</#list>
-</#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/optiontransferselect.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/optiontransferselect.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/optiontransferselect.ftl
deleted file mode 100644
index 62136f7..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/optiontransferselect.ftl
+++ /dev/null
@@ -1,301 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if !stack.findValue("#optiontransferselect_js_included")??><#t/>
-	<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"></script>
-	<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
-</#if><#t/>
-<table border="0">
-<tr>
-<td>
-<#if parameters.leftTitle??><#t/>
-	<label for="leftTitle">${parameters.leftTitle}</label><br />
-</#if><#t/>
-<#include "/${parameters.templateDir}/simple/select.ftl" />
-<#if parameters.allowUpDownOnLeft?default(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??>
-	value="${parameters.leftDownLabel?html}"
-</#if>
-/>
-<input type="button"
-	onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', <#if parameters.headerKey??>'${parameters.headerKey}'<#else>''</#if>);<#if parameters.upDownOnLeftOnclick?has_content>${parameters.upDownOnLeftOnclick};</#if>"
-<#if parameters.leftUpLabel??>
-	value="${parameters.leftUpLabel?html}"
-</#if>
-/>
-</#if>
-
-</td>
-<td valign="middle" align="center">
-	<#if parameters.allowAddToLeft?default(true)><#t/>
-		<#assign addToLeftLabel = parameters.addToLeftLabel?default("<-")?html/><#t/>
-		<#if parameters.doubleHeaderKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${addToLeftLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '');<#if parameters.addToLeftOnclick?has_content>${parameters.addToLeftOnclick};</#if>" /><br /><br />
-		<#else><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 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.headerKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${addToRightLabel}" onclick="moveSelectedOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '');<#if parameters.addToRightOnclick?has_content>${parameters.addToRightOnclick};</#if>" /><br /><br />
-		<#else><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 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.doubleHeaderKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle}"
-			</#if><#t/>
-			 value="${addAllToLeftLabel}" onclick="moveAllOptions(document.getElementById('${parameters.doubleId?html}'), document.getElementById('${parameters.id?html}'), false, '${parameters.doubleHeaderKey}', '');<#if parameters.addAllToLeftOnclick?has_content>${parameters.addAllToLeftOnclick};</#if>" /><br /><br />
-		<#else><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 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.headerKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${addAllToRightLabel}" onclick="moveAllOptions(document.getElementById('${parameters.id?html}'), document.getElementById('${parameters.doubleId?html}'), false, '${parameters.headerKey}', '');<#if parameters.addAllToRightOnclick?has_content>${parameters.addAllToRightOnclick};</#if>" /><br /><br />
-		<#else><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 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.headerKey?? && parameters.doubleHeaderKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
-		<#elseif parameters.headerKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${selectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id?html}'), 'key', '${parameters.headerKey}');selectAllOptions(document.getElementById('${parameters.doubleId?html}'));<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
-		<#elseif parameters.doubleHeaderKey??><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptionsExceptSome(document.getElementById('${parameters.doubleId?html}'), 'key', '${parameters.doubleHeaderKey}');<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
-		<#else><#t/>
-			<input type="button"
-			<#if parameters.buttonCssClass??><#t/>
-			 class="${parameters.buttonCssClass?html}"
-			</#if><#t/>
-			<#if parameters.buttonCssStyle??><#t/>
-			 style="${parameters.buttonCssStyle?html}"
-			</#if><#t/>
-			 value="${selectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id?html}'));selectAllOptions(document.getElementById('${parameters.doubleId?html}'));<#if parameters.selectAllOnclick?has_content>${parameters.selectAllOnclick};</#if>" /><br /><br />
-		</#if><#t/>
-	</#if><#t/>
-</td>
-<td>
-<#if parameters.rightTitle??><#t/>
-	<label for="rightTitle">${parameters.rightTitle}</label><br />
-</#if><#t/>
-<select
-	name="${parameters.doubleName?default("")?html}"
-	<#if parameters.get("doubleSize")??><#t/>
-	size="${parameters.get("doubleSize")?html}"
-	</#if><#t/>
-	<#if parameters.doubleDisabled?default(false)><#t/>
-	disabled="disabled"
-	</#if><#t/>
-	<#if parameters.doubleMultiple?default(false)><#t/>
-	multiple="multiple"
-	</#if><#t/>
-	<#if parameters.doubleTabindex??><#t/>
-	tabindex="${parameters.tabindex?html}"
-	</#if><#t/>
-	<#if parameters.doubleId??><#t/>
-	id="${parameters.doubleId?html}"
-	</#if><#t/>
-	<#if parameters.doubleCss??><#t/>
-	class="${parameters.doubleCss?html}"
-	</#if><#t/>
-	<#if parameters.doubleStyle??><#t/>
-	style="${parameters.doubleStyle?html}"
-	</#if><#t/>
-    <#if parameters.doubleOnclick??><#t/>
-    onclick="${parameters.doubleOnclick?html}"
-    </#if><#t/>
-    <#if parameters.doubleOndblclick??><#t/>
-    ondblclick="${parameters.doubleOndblclick?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnmousedown??><#t/>
-    onmousedown="${parameters.doubleOnmousedown?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnmouseup??><#t/>
-    onmouseup="${parameters.doubleOnmouseup?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnmousemove??><#t/>
-    onmousemove="${parameters.doubleOnmousemove?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnmouseover??><#t/>
-    onmouseover="${parameters.doubleOnmouseover?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnmouseout??><#t/>
-    onmouseout="${parameters.doubleOnmouseout?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnfocus??><#t/>
-    onfocus="${parameters.doubleOnfocus?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnblur??><#t/>
-    onblur="${parameters.doubleOnblur?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnkeypress??><#t/>
-    onkeypress="${parameters.doubleOnkeypress?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnKeydown??><#t/>
-    onkeydown="${parameters.doubleOnkeydown?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnkeyup??><#t/>
-    onkeyup="${parameters.doubleOnkeyup?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnselect??><#t/>
-    onselect="${parameters.doubleOnselect?html}"
-    </#if><#t/>
-    <#if parameters.doubleOnchange??><#t/>
-    onchange="${parameters.doubleOnchange?html}"
-    </#if><#t/>
-    <#if parameters.doubleAccesskey??><#t/>
-    accesskey="${parameters.doubleAccesskey?html}"
-    </#if>
->
-	<#if parameters.doubleHeaderKey?? && parameters.doubleHeaderValue??><#t/>
-    <option value="${parameters.doubleHeaderKey?html}">${parameters.doubleHeaderValue?html}</option>
-	</#if><#t/>
-	<#if parameters.doubleEmptyOption?default(false)><#t/>
-    <option value=""></option>
-	</#if><#t/>
-	<@s.iterator value="parameters.doubleList"><#t/>
-        <#if parameters.doubleListKey??><#t/>
-            <#assign doubleItemKey = stack.findValue(parameters.doubleListKey) /><#t/>
-        <#else><#t/>
-            <#assign doubleItemKey = stack.findValue('top') /><#t/>
-        </#if><#t/>
-        <#assign doubleItemKeyStr = doubleItemKey.toString() /><#t/>
-        <#if parameters.doubleListValue??><#t/>
-            <#assign doubleItemValue = stack.findString(parameters.doubleListValue)!"" /><#t/>
-        <#else><#t/>
-            <#assign doubleItemValue = stack.findString('top') /><#t/>
-        </#if><#t/>
-    	<option value="${doubleItemKeyStr?html}"<#rt/>
-        <#if tag.contains(parameters.doubleNameValue, doubleItemKey)><#t/>
- 		selected="selected"<#rt/>
-        </#if><#t/>
-    	>${doubleItemValue?html}</option><#lt/>
-	</@s.iterator><#t/>
-</select>
-<#if parameters.doubleMultiple?default(false)>
-<input type="hidden" id="__multiselect_${parameters.doubleId?html}" name="__multiselect_${parameters.doubleName?default("")?html}" value=""<#rt/>
-<#if parameters.doubleDisabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
- />
-</#if>
-<#if parameters.allowUpDownOnRight?default(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??>
-	value="${parameters.rightDownLabel?html}"
-</#if>
-/>
-<input type="button"
-	onclick="moveOptionUp(document.getElementById('${parameters.doubleId}'), 'key', <#if parameters.doubleHeaderKey??>'${parameters.doubleHeaderKey}'<#else>''</#if>);<#if parameters.upDownOnRightOnclick?has_content>${parameters.upDownOnRightOnclick};</#if>"
-<#if parameters.rightUpLabel??>
-	value="${parameters.rightUpLabel?html}"
-</#if>
-/>
-</#if>
-</td>
-</tr>
-</table>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/password.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/password.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/password.ftl
deleted file mode 100644
index b036b92..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/password.ftl
+++ /dev/null
@@ -1,53 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<input type="password"<#rt/>
- name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")??>
- size="${parameters.get("size")?html}"<#rt/>
-</#if>
-<#if parameters.maxlength??>
- maxlength="${parameters.maxlength?html}"<#rt/>
-</#if>
-<#if parameters.nameValue?? && parameters.showPassword?default(false)>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.readonly?default(false)>
- readonly="readonly"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/radiomap.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/radiomap.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/radiomap.ftl
deleted file mode 100644
index 34cf1b1..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/radiomap.ftl
+++ /dev/null
@@ -1,94 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<@s.iterator value="parameters.list">
-    <#if parameters.listKey??>
-        <#assign itemKey = stack.findValue(parameters.listKey)/>
-    <#else>
-        <#assign itemKey = stack.findValue('top')/>
-    </#if>
-    <#assign itemKeyStr = itemKey.toString() />
-    <#if parameters.listValue??>
-        <#assign itemValue = stack.findString(parameters.listValue)/>
-    <#else>
-        <#assign itemValue = stack.findString('top')/>
-    </#if>
-    <#if parameters.listCssClass??>
-        <#if stack.findString(parameters.listCssClass)??>
-          <#assign itemCssClass= stack.findString(parameters.listCssClass)/>
-        <#else>
-          <#assign itemCssClass = ''/>
-        </#if>
-    </#if>
-    <#if parameters.listCssStyle??>
-        <#if stack.findString(parameters.listCssStyle)??>
-          <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/>
-        <#else>
-          <#assign itemCssStyle = ''/>
-        </#if>
-    </#if>
-    <#if parameters.listTitle??>
-        <#if stack.findString(parameters.listTitle)??>
-          <#assign itemTitle= stack.findString(parameters.listTitle)/>
-        <#else>
-          <#assign itemTitle = ''/>
-        </#if>
-    </#if>
-<input type="radio"<#rt/>
-<#if parameters.name??>
- name="${parameters.name?html}"<#rt/>
-</#if>
- id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
-<#if tag.contains(parameters.nameValue?default(''), itemKeyStr)>
- checked="checked"<#rt/>
-</#if>
-<#if itemKey??>
- value="${itemKeyStr?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if itemCssClass?if_exists != "">
- class="${itemCssClass?html}"<#rt/>
-</#if>
-<#if itemCssStyle?if_exists != "">
- style="${itemCssStyle?html}"<#rt/>
-</#if>
-<#if itemTitle?if_exists != "">
- title="${itemTitle?html}"<#rt/>
-<#else>
-    <#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-    </#if>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-/><#rt/>
-<label for="${parameters.id?html}${itemKeyStr?html}"<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl"/>><#rt/>
-    ${itemValue}<#t/>
-</label>
-</@s.iterator>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/reset.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/reset.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/reset.ftl
deleted file mode 100644
index 0ddba57..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/reset.ftl
+++ /dev/null
@@ -1,76 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if parameters.type?? && parameters.type=="button">
-<button type="reset"<#rt/>
-<#if parameters.name??>
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.nameValue??>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl"/>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-><#if parameters.src??>
-<img<#rt/>
-<#if parameters.label??>
- alt="${parameters.label?html}"<#rt/>
-</#if>
-<#if parameters.src??>
- src="${parameters.src?html}"<#rt/>
-</#if>
-/><#else><#if parameters.label??><@s.property value="parameters.label"/><#rt/></#if></#if></button>
-<#else>
-<input type="reset"<#rt/>
-<#if parameters.name??>
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.nameValue??>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-/>
-</#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl
deleted file mode 100644
index c998e61..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/scripting-events.ftl
+++ /dev/null
@@ -1,64 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if parameters.onclick??>
- onclick="${parameters.onclick?html}"<#rt/>
-</#if>
-<#if parameters.ondblclick??>
- ondblclick="${parameters.ondblclick?html}"<#rt/>
-</#if>
-<#if parameters.onmousedown??>
- onmousedown="${parameters.onmousedown?html}"<#rt/>
-</#if>
-<#if parameters.onmouseup??>
- onmouseup="${parameters.onmouseup?html}"<#rt/>
-</#if>
-<#if parameters.onmouseover??>
- onmouseover="${parameters.onmouseover?html}"<#rt/>
-</#if>
-<#if parameters.onmousemove??>
- onmousemove="${parameters.onmousemove?html}"<#rt/>
-</#if>
-<#if parameters.onmouseout??>
- onmouseout="${parameters.onmouseout?html}"<#rt/>
-</#if>
-<#if parameters.onfocus??>
- onfocus="${parameters.onfocus?html}"<#rt/>
-</#if>
-<#if parameters.onblur??>
- onblur="${parameters.onblur?html}"<#rt/>
-</#if>
-<#if parameters.onkeypress??>
- onkeypress="${parameters.onkeypress?html}"<#rt/>
-</#if>
-<#if parameters.onkeydown??>
- onkeydown="${parameters.onkeydown?html}"<#rt/>
-</#if>
-<#if parameters.onkeyup??>
- onkeyup="${parameters.onkeyup?html}"<#rt/>
-</#if>
-<#if parameters.onselect??>
- onselect="${parameters.onselect?html}"<#rt/>
-</#if>
-<#if parameters.onchange??>
- onchange="${parameters.onchange?html}"<#rt/>
-</#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/select.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/select.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/select.ftl
deleted file mode 100644
index 74277e6..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/select.ftl
+++ /dev/null
@@ -1,140 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#setting number_format="#.#####">
-<select<#rt/>
- name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")??>
- size="${parameters.get("size")?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.multiple?default(false)>
- multiple="multiple"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
->
-<#if parameters.headerKey?? && parameters.headerValue??>
-    <option value="${parameters.headerKey?html}"
-    <#if tag.contains(parameters.nameValue, parameters.headerKey) == true>
-    selected="selected"
-    </#if>
-    >${parameters.headerValue?html}</option>
-</#if>
-<#if parameters.emptyOption?default(false)>
-    <option value=""></option>
-</#if>
-<@s.iterator value="parameters.list">
-        <#if parameters.listKey??>
-            <#if stack.findValue(parameters.listKey)??>
-              <#assign itemKey = stack.findValue(parameters.listKey)/>
-              <#assign itemKeyStr = stack.findString(parameters.listKey)/>
-            <#else>
-              <#assign itemKey = ''/>
-              <#assign itemKeyStr = ''/>
-            </#if>
-        <#else>
-            <#assign itemKey = stack.findValue('top')/>
-            <#assign itemKeyStr = stack.findString('top')>
-        </#if>
-        <#if parameters.listValue??>
-            <#if stack.findString(parameters.listValue)??>
-              <#assign itemValue = stack.findString(parameters.listValue)/>
-            <#else>
-              <#assign itemValue = ''/>
-            </#if>
-        <#else>
-            <#assign itemValue = stack.findString('top')/>
-        </#if>
-        <#if parameters.listCssClass??>
-            <#if stack.findString(parameters.listCssClass)??>
-              <#assign itemCssClass= stack.findString(parameters.listCssClass)/>
-            <#else>
-              <#assign itemCssClass = ''/>
-            </#if>
-        </#if>
-        <#if parameters.listCssStyle??>
-            <#if stack.findString(parameters.listCssStyle)??>
-              <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/>
-            <#else>
-              <#assign itemCssStyle = ''/>
-            </#if>
-        </#if>
-        <#if parameters.listTitle??>
-            <#if stack.findString(parameters.listTitle)??>
-              <#assign itemTitle= stack.findString(parameters.listTitle)/>
-            <#else>
-              <#assign itemTitle = ''/>
-            </#if>
-        </#if>
-    <option value="${itemKeyStr?html}"<#rt/>
-        <#if tag.contains(parameters.nameValue, itemKey) == true>
- selected="selected"<#rt/>
-        </#if>
-        <#if itemCssClass?if_exists != "">
- class="${itemCssClass?html}"<#rt/>
-        </#if>
-        <#if itemCssStyle?if_exists != "">
- style="${itemCssStyle?html}"<#rt/>
-        </#if>
-        <#if itemTitle?if_exists != "">
- title="${itemTitle?html}"<#rt/>
-        </#if>
-    >${itemValue?html}</option><#lt/>
-</@s.iterator>
-
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/optgroup.ftl" />
-
-</select>
-
-<#if parameters.multiple?default(false)>
-  <#if (parameters.id?? && parameters.name??)>
-    <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" value=""<#rt/>
-  </#if>
-  <#if (parameters.id?? && !parameters.name??)>
-    <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/>
-  </#if>
-  <#if ( !parameters.id?? && parameters.name??)>
-    <input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.id?html}" value=""<#rt/>
-  </#if>
-   <#if ( !parameters.id?? && !parameters.name??)>
-     <input type="hidden" id="" name="" value="" <#rt/>
-  </#if>
-  
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
- />
-</#if>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl
deleted file mode 100644
index 2bb7347..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/submit-close.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-<#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>
-</button>
-<#else>
-${parameters.body}<#rt/>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/submit.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/submit.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/submit.ftl
deleted file mode 100644
index 95315ef..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/submit.ftl
+++ /dev/null
@@ -1,93 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if parameters.type?? && parameters.type=="button">
-<button type="submit"<#rt/>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.name??>
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.nameValue??>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl"/>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
->
-<#else>
-<#if parameters.type?? && parameters.type=="image">
-<input type="image"<#rt/>
-<#if parameters.label??>
- alt="${parameters.label?html}"<#rt/>
-</#if>
-<#if parameters.src??>
- src="${parameters.src?html}"<#rt/>
-</#if>
-<#else>
-<input type="submit"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.name??>
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.nameValue??>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-/>
-</#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/table.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/table.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/table.ftl
deleted file mode 100644
index d7efb06..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/table.ftl
+++ /dev/null
@@ -1,76 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#assign webTable = tag/>
-<#assign tableModel = webTable.model/>
-
-<#if tableModel??>
-<p align="center">
-<table bgcolor="white" border="0" cellpadding="1" cellspacing="0" >
-    <tr>
-        <td>
-            <table  border="0" cellpadding="2" cellspacing="1">
-                <tr bgcolor="yellow">
-<#list webTable.columns as curColumn>
-<#if curColumn.visible>
-                    <th>
-<#if webTable.sortable>
-                        <table border="0" cellspacing="0" cellpadding="0">
-                            <tr>
-                                <td>${curColumn.displayName}</td>
-                                <td>
-                                    <table border="0" cellspacing="0" cellpadding="0">
-                                        <tr>
-                                            <td align="bottom">
-<#if false>
-                                                 <img src="images/sorted_asc.gif" border="0" align="bottom" />
-<#else>
-                                                <a href="<@s.url><@s.param name="${webTable.sortColumnLinkName}" value="${curColumn.offset}"/><@s.param name="${webTable.sortOrderLinkName}" value="ASC"/></@s.url>"><img src="images/unsorted_asc.gif" border="0" align="bottom"/></a>
-</#if>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td align="top"></td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                        </table>
-<#else>
-                        ${curColumn.displayName}
-</#if>
-                    </th>
-</#if>
-</#list>
-                </tr>
-<#list webTable.rowIterator as curRow>
-                <tr>
-<#list curRow as curColumn>
-                    <td>${curColumn}</td>
-</#list>
-                </tr>
-</#list>
-            </table>
-        </td>
-    </tr>
-</table>
-</#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/text.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/text.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/text.ftl
deleted file mode 100644
index 1caf3aa..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/text.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<input<#rt/>
- type="${parameters.type?default("text")?html}"<#rt/>
- name="${parameters.name?default("")?html}"<#rt/>
-<#if parameters.get("size")??>
- size="${parameters.get("size")?html}"<#rt/>
-</#if>
-<#if parameters.maxlength??>
- maxlength="${parameters.maxlength?html}"<#rt/>
-</#if>
-<#if parameters.nameValue??>
- value="${parameters.nameValue?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.readonly?default(false)>
- readonly="readonly"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/textarea.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/textarea.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/textarea.ftl
deleted file mode 100644
index 6cf1e9b..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/textarea.ftl
+++ /dev/null
@@ -1,53 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<textarea<#rt/>
- name="${parameters.name?default("")?html}"<#rt/>
- cols="${parameters.cols?default("")?html}"<#rt/>
- rows="${parameters.rows?default("")?html}"<#rt/>
-<#if parameters.wrap??>
- wrap="${parameters.wrap?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.readonly?default(false)>
- readonly="readonly"<#rt/>
-</#if>
-<#if parameters.tabindex??>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.id??>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/css.ftl" />
-<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
-><#rt/>
-<#if parameters.nameValue??>
-<@s.property value="parameters.nameValue"/><#t/>
-</#if>
-</textarea>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/token.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/token.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/token.ftl
deleted file mode 100644
index cabfa9c..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/token.ftl
+++ /dev/null
@@ -1,24 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<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

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/simple/updownselect.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/simple/updownselect.ftl b/themes_override/src/main/webapp/WEB-INF/template/simple/updownselect.ftl
deleted file mode 100644
index 30128ef..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/simple/updownselect.ftl
+++ /dev/null
@@ -1,57 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if !stack.findValue("#optiontransferselect_js_included")??><#t/>
-	<script type="text/javascript" src="<@s.url value="/struts/optiontransferselect.js" encode='false' includeParams='none'/>"></script>
-	<#assign temporaryVariable = stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
-</#if><#t/>
-<table>
-<tr><td>
-<#include "/${templateDir}/simple/select.ftl" /><#t/>
-</td></tr>
-<tr><td>
-<#if parameters.allowMoveUp?default(true)><#t/>
-	<#assign defMoveUpLabel="${parameters.moveUpLabel?default('^')}" /><#t/>
-	<#if parameters.headerKey??><#t/>
-		&nbsp;<input type="button" value="${defMoveUpLabel}" onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />&nbsp;
-	<#else><#t/>
-		&nbsp;<input type="button" value="${defMoveUpLabel}" onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '');" />&nbsp;
-	</#if><#t/>
-</#if><#t/>
-<#if parameters.allowMoveDown?default(true)><#t/>
-	<#assign defMoveDownLabel="${parameters.moveDownLabel?default('v')}" /><#t/>
-	<#if parameters.headerKey??><#t/>
-		&nbsp;<input type="button" value="${defMoveDownLabel}" onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />&nbsp;
-	<#else><#t/>
-		&nbsp;<input type="button" value="${defMoveDownLabel}" onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key', '');" />&nbsp;
-	</#if><#t/>
-</#if><#t/>
-<#if parameters.allowSelectAll?default(true)><#t/>
-	<#assign defSelectAllLabel="${parameters.selectAllLabel?default('*')}" /><#t/>
-	<#if parameters.headerKey??><#t/>
-		&nbsp;<input type="button" value="${defSelectAllLabel}" onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id}'), 'key', '${parameters.headerKey}');" />&nbsp;
-	<#else><#t/>
-		&nbsp;<input type="button" value="${defSelectAllLabel}" onclick="selectAllOptions(document.getElementById('${parameters.id}'), 'key', '');" />&nbsp;
-	</#if><#t/>
-</#if><#t/>
-</td></tr>
-</table>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkbox.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkbox.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkbox.ftl
deleted file mode 100644
index 4504b3f..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkbox.ftl
+++ /dev/null
@@ -1,129 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/>
-<#if hasFieldErrors>
-<#list fieldErrors[parameters.name] as error>
-<tr<#rt/>
-<#if parameters.id??>
- errorFor="${parameters.id}"<#rt/>
-</#if>
->
-    <td align="left" valign="top" colspan="2"><#rt/>
-        <span class="errorMessage">${error?html}</span><#t/>
-    </td><#lt/>
-</tr>
-</#list>
-</#if>
-<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
-<#assign labelpos = parameters.form.labelposition/>
-<#elseif parameters.labelposition??>
-<#assign labelpos = parameters.labelposition/>
-</#if>
-<#if labelpos?default("") == 'top'>
-<tr>
-    <td colspan="2">
-<#if parameters.label??> <label<#t/>
-<#if parameters.id??>
- for="${parameters.id?html}"<#rt/>
-</#if>
-<#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
-<#else>
- class="checkboxLabel"<#rt/>
-</#if>
->
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
-        <span class="required">*</span><#t/>
-</#if>
-${parameters.label?html}<#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
- <span class="required">*</span><#t/>
-</#if>
-:<#t/>
-<#if parameters.tooltip??>
-    <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
-</#if>
-</label><#t/>
-</#if>
-    </td>
-</tr>
-<tr>
-    <td colspan="2">
-        <#include "/${parameters.templateDir}/simple/checkbox.ftl" />
-<#else>
-<tr>
-	<td valign="top" align="right">
-<#if labelpos?default("") == 'left'>
-<#if parameters.label??> <label<#t/>
-<#if parameters.id??>
- for="${parameters.id?html}"<#rt/>
-</#if>
-<#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
-<#else>
- class="checkboxLabel"<#rt/>
-</#if>
->
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
-        <span class="required">*</span><#t/>
-</#if>
-${parameters.label?html}<#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
- <span class="required">*</span><#t/>
-</#if>
-:<#t/>
-<#if parameters.tooltip??>
-    <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
-</#if>
-</label><#t/>
-</#if>
-</#if>
-<#if labelpos?default("") == 'right'>
-    <#if parameters.required?default(false)>
-        <span class="required">*</span><#t/>
-    </#if>
-    <#if parameters.tooltip??>
-        <#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
-    </#if>
-</#if>
-    </td>
-    <td valign="top" align="left">
-
-<#if labelpos?default("") != 'top'>
-                	<#include "/${parameters.templateDir}/simple/checkbox.ftl" />
-</#if>                    
-<#if labelpos?default("") != 'top' && labelpos?default("") != 'left'>
-<#if parameters.label??> <label<#t/>
-<#if parameters.id??>
- for="${parameters.id?html}"<#rt/>
-</#if>
-<#if hasFieldErrors>
- class="checkboxErrorLabel"<#rt/>
-<#else>
- class="checkboxLabel"<#rt/>
-</#if>
->${parameters.label?html}</label><#rt/>
-</#if>
-</#if>
-</#if>
- <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /><#nt/>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkboxlist.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkboxlist.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkboxlist.ftl
deleted file mode 100644
index 8cc0dd8..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/checkboxlist.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/simple/checkboxlist.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /><#nt/>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/combobox.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/combobox.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/combobox.ftl
deleted file mode 100644
index a1a85f1..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/combobox.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" />
-<#include "/${parameters.templateDir}/simple/combobox.ftl" />
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /><#nt/>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/control-close.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/control-close.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/control-close.ftl
deleted file mode 100644
index a89de7e..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/control-close.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-</table>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/control.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/control.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/control.ftl
deleted file mode 100644
index 2761ac3..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/control.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<table class="${parameters.cssClass?default('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-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlfooter.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlfooter.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlfooter.ftl
deleted file mode 100644
index 37da2f8..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlfooter.ftl
+++ /dev/null
@@ -1,38 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-${parameters.after?if_exists}<#t/>
-    </td><#lt/>
-</tr>
-<#if parameters.errorposition?default("top") == 'bottom'>
-<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
-<#if hasFieldErrors>
-<#list fieldErrors[parameters.name] as error>
-<tr errorFor="${parameters.id}">
-    <td align="center" valign="top" colspan="2"><#rt/>
-        <span class="errorMessage">${error?html}</span><#t/>
-    </td><#lt/>
-</tr>
-</#list>
-</#if>
-</#if>
-

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlheader-core.ftl
----------------------------------------------------------------------
diff --git a/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlheader-core.ftl b/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlheader-core.ftl
deleted file mode 100644
index 7330270..0000000
--- a/themes_override/src/main/webapp/WEB-INF/template/xhtml/controlheader-core.ftl
+++ /dev/null
@@ -1,81 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#--
-	Only show message if errors are available.
-	This will be done if ActionSupport is used.
--->
-<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/>
-<#if parameters.errorposition?default("top") == 'top'>
-<#if hasFieldErrors>
-<#list fieldErrors[parameters.name] as error>
-<tr errorFor="${parameters.id}">
-    <td align="center" valign="top" colspan="2"><#rt/>
-        <span class="errorMessage">${error?html}</span><#t/>
-    </td><#lt/>
-</tr>
-</#list>
-</#if>
-</#if>
-<#if !parameters.labelposition?? && (parameters.form.labelposition)??>
-<#assign labelpos = parameters.form.labelposition/>
-<#elseif parameters.labelposition??>
-<#assign labelpos = parameters.labelposition/>
-</#if>
-<#--
-	if the label position is top,
-	then give the label it's own row in the table
--->
-<tr>
-<#if labelpos?default("") == 'top'>
-    <td align="left" valign="top" colspan="2"><#rt/>
-<#else>
-    <td class="tdLabel"><#rt/>
-</#if>
-<#if parameters.label??>
-    <label <#t/>
-<#if parameters.id??>
-        for="${parameters.id?html}" <#t/>
-</#if>
-<#if hasFieldErrors>
-        class="errorLabel"<#t/>
-<#else>
-        class="label"<#t/>
-</#if>
-    ><#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
-        <span class="required">*</span><#t/>
-</#if>
-${parameters.label?html}<#t/>
-<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
- <span class="required">*</span><#t/>
-</#if>
-${parameters.labelseparator?default(":")?html}<#t/>
-<#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" />
-</label><#t/>
-</#if>
-    </td><#lt/>
-<#-- add the extra row -->
-<#if labelpos?default("") == 'top'>
-</tr>
-<tr>
-</#if>


Mime
View raw message