[struts] 10/14: WW-5049 Drops unused files

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5049-velocity-plugin
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 0009bdeb31c9864267b1c5a8583bf975e42e16c9
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Wed Nov 27 19:58:59 2019 +0100

    WW-5049 Drops unused files
---
 .../resources/template/velocity/ajax/a-close.vm    |  21 ----
 .../src/main/resources/template/velocity/ajax/a.vm |  33 -------
 .../resources/template/velocity/ajax/div-close.vm  |  21 ----
 .../main/resources/template/velocity/ajax/div.vm   |  35 -------
 .../resources/template/velocity/ajax/form-close.vm |  22 -----
 .../main/resources/template/velocity/ajax/form.vm  |  39 --------
 .../resources/template/velocity/ajax/submit.vm     |  33 -------
 .../resources/template/velocity/ajax/tab-close.vm  |  27 ------
 .../main/resources/template/velocity/ajax/tab.vm   |  37 -------
 .../resources/template/velocity/simple/checkbox.vm |  30 ------
 .../template/velocity/simple/checkboxlist.vm       |  45 ---------
 .../resources/template/velocity/simple/combobox.vm |  43 --------
 .../resources/template/velocity/simple/debug.vm    |  85 ----------------
 .../template/velocity/simple/doubleselect.vm       | 108 ---------------------
 .../resources/template/velocity/simple/empty.vm    |  20 ----
 .../resources/template/velocity/simple/file.vm     |  32 ------
 .../template/velocity/simple/form-close.vm         |  21 ----
 .../resources/template/velocity/simple/form.vm     |  32 ------
 .../resources/template/velocity/simple/hidden.vm   |  28 ------
 .../resources/template/velocity/simple/label.vm    |  26 -----
 .../resources/template/velocity/simple/password.vm |  34 -------
 .../resources/template/velocity/simple/radiomap.vm |  55 -----------
 .../template/velocity/simple/scripting-events.vm   |  34 -------
 .../resources/template/velocity/simple/select.vm   |  63 ------------
 .../resources/template/velocity/simple/submit.vm   |  27 ------
 .../resources/template/velocity/simple/table.vm    | 101 -------------------
 .../resources/template/velocity/simple/text.vm     |  34 -------
 .../resources/template/velocity/simple/textarea.vm |  33 -------
 .../resources/template/velocity/simple/token.vm    |  22 -----
 .../resources/template/velocity/xhtml/checkbox.vm  |  39 --------
 .../template/velocity/xhtml/checkboxlist.vm        |  23 -----
 .../resources/template/velocity/xhtml/combobox.vm  |  21 ----
 .../template/velocity/xhtml/controlfooter.vm       |  22 -----
 .../template/velocity/xhtml/controlheader.vm       |  47 ---------
 .../resources/template/velocity/xhtml/debug.vm     |  21 ----
 .../template/velocity/xhtml/doubleselect.vm        |  21 ----
 .../resources/template/velocity/xhtml/empty.vm     |  20 ----
 .../main/resources/template/velocity/xhtml/file.vm |  21 ----
 .../template/velocity/xhtml/form-close.vm          |  22 -----
 .../main/resources/template/velocity/xhtml/form.vm |  28 ------
 .../resources/template/velocity/xhtml/hidden.vm    |  21 ----
 .../resources/template/velocity/xhtml/label.vm     |  21 ----
 .../resources/template/velocity/xhtml/password.vm  |  21 ----
 .../resources/template/velocity/xhtml/radiomap.vm  |  21 ----
 .../resources/template/velocity/xhtml/select.vm    |  21 ----
 .../resources/template/velocity/xhtml/submit.vm    |  23 -----
 .../resources/template/velocity/xhtml/table.vm     |  21 ----
 .../main/resources/template/velocity/xhtml/text.vm |  21 ----
 .../resources/template/velocity/xhtml/textarea.vm  |  22 -----
 .../resources/template/velocity/xhtml/token.vm     |  21 ----
 50 files changed, 1639 deletions(-)

diff --git 
a/plugins/velocity/src/main/resources/template/velocity/ajax/a-close.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/a-close.vm
deleted file mode 100644
index f8c9229..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/a-close.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-</a>
diff --git a/plugins/velocity/src/main/resources/template/velocity/ajax/a.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/a.vm
deleted file mode 100644
index 83c3501..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/a.vm
+++ /dev/null
@@ -1,33 +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.
- *#
-<a dojoType="BindAnchor" evalResult="true"
-#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
-#if ($parameters.href) href="$!struts.htmlEncode($parameters.href)" #end
-#if ($parameters.notifyTopics) 
notifyTopics="$!struts.htmlEncode($parameters.notifyTopics)" #end
-#if ($parameters.errorText) 
errorHtml="$!struts.htmlEncode($parameters.errorText)" #end
-#if ($parameters.showErrorTransportText)  showTransportError="true" #end
-#if ($parameters.afterLoading) onLoad="$!parameters.afterLoading" #end
-#if ($parameters.preInvokeJS) preInvokeJS="$!parameters.preInvokeJS" #end
-#if ($parameters.tabindex) 
tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" 
#end
-#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" 
#end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
->
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/ajax/div-close.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/div-close.vm
deleted file mode 100644
index da96f0c..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/div-close.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-</div>
diff --git a/plugins/velocity/src/main/resources/template/velocity/ajax/div.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/div.vm
deleted file mode 100644
index 2d7d925..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/div.vm
+++ /dev/null
@@ -1,35 +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.
- *#
-<div dojoType='BindDiv'
-#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
-#if ($parameters.href) href="$!parameters.href" #end
-#if ($parameters.loadingText) 
loadingHtml="$!struts.htmlEncode($parameters.loadingText)" #end
-#if ($parameters.errorText) 
errorHtml="$!struts.htmlEncode($parameters.errorText)" #end
-#if ($parameters.showErrorTransportText) showTransportError="true" #end
-#if ($parameters.delay) delay="$!parameters.delay" #end
-#if ($parameters.updateFreq) refresh="$!parameters.updateFreq" #end
-#if ($parameters.listenTopics) listenTopics="$!parameters.listenTopics" #end
-#if ($parameters.afterLoading) onLoad="$!parameters.afterLoading" #end
-#if ($parameters.tabindex) 
tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
-#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" 
#end
-#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" 
#end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
->
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/ajax/form-close.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/form-close.vm
deleted file mode 100644
index 9e62164..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/form-close.vm
+++ /dev/null
@@ -1,22 +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>
-</form>
diff --git a/plugins/velocity/src/main/resources/template/velocity/ajax/form.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/form.vm
deleted file mode 100644
index 2ad6075..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/form.vm
+++ /dev/null
@@ -1,39 +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.validate)
-<script src="$!base/struts/validationClient.js"></script>
-<script src="$!base/dwr/interface/validator.js"></script>
-<script src="$!base/dwr/engine.js"></script>
-<script src="$!base/struts/template/xhtml/validation.js"></script>
-#end
-<form
-#if ($parameters.namespace) 
namespace="$!struts.htmlEncode($parameters.namespace)" #end
-#if ($parameters.id) id="$!struts.htmlEncode($parameters.id)" #end
-#if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
-#if ($parameters.action) action="$!struts.htmlEncode($parameters.action)" #end
-#if ($parameters.target) target="$!struts.htmlEncode($parameters.target)" #end
-#if ($parameters.method) method="$!struts.htmlEncode($parameters.method)" #end
-#if ($parameters.enctype) enctype="$!struts.htmlEncode($parameters.enctype)" 
#end
-#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" 
#end
-#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" 
#end
-onSubmit="return false;"
->
-<table class="wwFormTable">
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/ajax/submit.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/submit.vm
deleted file mode 100644
index 26056fa..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/submit.vm
+++ /dev/null
@@ -1,33 +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.
- *#
-<button type="submit" dojoType="BindButton"<#rt/>
-#if ($parameters.form && $parameters.form.id)  formId="$parameters.form.id" 
#end
-#if ($parameters.name) name="$!struts.htmlEncode($parameters.name)" #end
-#if ($parameters.nameValue) value="$!struts.htmlEncode($parameters.nameValue)" 
#end
-#if ($parameters.cssClass) class="$!struts.htmlEncode($parameters.cssClass)" 
#end
-#if ($parameters.cssStyle) style="$!struts.htmlEncode($parameters.cssStyle)" 
#end
-#if ($parameters.resultDivId) 
targetDiv="$!struts.htmlEncode($parameters.resultDivId)" #end
-#if ($parameters.onLoadJS) onLoad="$!parameters.onLoadJS" #end
-#if ($parameters.preInvokeJS) preInvokeJS="$!parameters.preInvokeJS" #end
-#if ($parameters.notifyTopics) 
notifyTopics="$!struts.htmlEncode($parameters.notifyTopics)" #end
-#if ($parameters.listenTopics) 
listenTopics="$!struts.htmlEncode($parameters.listenTopics)" #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/ajax/tab-close.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/tab-close.vm
deleted file mode 100644
index 2353ee7..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/tab-close.vm
+++ /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.
- *#
-    </div>
-    </div>
-
-    <script type="text/javascript">
-        var tabpanelc_$!parameters.id = new TabContent( "$!parameters.id", 
$!parameters.remote );
-        dojo.event.topic.subscribe( "$!parameters.subscribeTopicName", 
tabpanelc_$!parameters.id, "updateVisibility" );
-    </script>
diff --git a/plugins/velocity/src/main/resources/template/velocity/ajax/tab.vm 
b/plugins/velocity/src/main/resources/template/velocity/ajax/tab.vm
deleted file mode 100644
index 5551944..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/ajax/tab.vm
+++ /dev/null
@@ -1,37 +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.
- *#
-<div class="tab_contents_header" id="tab_contents_${parameters.id}">
-    <div class="tab_contents"
-         id="tab_contents_update_${parameters.id}"
-        #if ($parameters.remote)
-             dojoType='BindDiv'
-             #if ($parameters.href) 
href="$!struts.htmlEncode($parameters.href)" #end
-             #if ($parameters.loadingText) 
loadingHtml="$!struts.htmlEncode($parameters.loadingText)" #end
-             #if ($parameters.errorText) 
errorHtml="$!struts.htmlEncode($parameters.errorText)" #end
-             #if ($parameters.showErrorTransportText) 
showTransportError="true" #end
-             #if ($parameters.delay) delay="$!parameters.delay" #end
-             #if ($parameters.updateFreq) refresh="$!parameters.updateFreq" 
#end
-             #if ($parameters.listenTopics) 
listenTopics="$!struts.htmlEncode($parameters.listenTopics)" #end
-             #if ($parameters.afterLoading) 
onLoad="$!struts.htmlEncode($parameters.afterLoading)" #end
-     #end
-        #if ($parameters.cssClass) 
class="$!struts.htmlEncode($parameters.cssClass)" #end
-        #if ($parameters.cssStyle) 
style="$!struts.htmlEncode($parameters.cssStyle)" #end
-      >
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/checkbox.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/checkbox.vm
deleted file mode 100644
index bd9e0e8..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/checkbox.vm
+++ /dev/null
@@ -1,30 +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="checkbox" name="$!struts.htmlEncode($parameters.name)" 
value="$!struts.htmlEncode($parameters.fieldValue)"
-#if ($parameters.nameValue)        checked="checked"                           
             #end
-#if ($parameters.disabled && $parameters.disabled == true)
-                                   disabled="disabled"                         
             #end
-#if ($parameters.tabindex)         
tabindex="$!struts.htmlEncode($parameters.tabindex)"    #end
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"       #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/checkboxlist.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/checkboxlist.vm
deleted file mode 100644
index 979bc3a..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/simple/checkboxlist.vm
+++ /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.
- *#
-#set( $items = $parameters.list )
-#if( $items )
-    #set( $itemCount = 0 )
-    #foreach( $item in $items )
-        #set( $itemCount = $itemCount + 1)
-        $stack.push($item)
-        #if( $parameters.listKey )
-            #set( $itemKey = $stack.findValue($parameters.listKey) )
-        #else
-            #set( $itemKey = $item )
-        #end
-        #if( $parameters.listValue )
-            #set( $itemValue  = $stack.findValue($parameters.listValue) )
-        #else
-            #set( $itemValue = $item )
-        #end
-        <input type="checkbox" name="$!struts.htmlEncode($parameters.name)" 
value="$!struts.htmlEncode($itemKey)"
-        #parse("/$parameters.templateDir/simple/scripting-events.vm")
-        id="$!struts.htmlEncode($parameters.name)-$itemCount" #if( 
$tag.contains($parameters.nameValue, $itemKey) ) checked="checked" #end />
-        <label for="$!struts.htmlEncode($parameters.name)-$itemCount" 
class="checkboxLabel">$!struts.htmlEncode($itemValue)</label><br />
-        #set ($trash = $stack.pop())
-    #end
-#else
-  &nbsp;
-#end
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/combobox.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/combobox.vm
deleted file mode 100644
index 42fc0e3..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/combobox.vm
+++ /dev/null
@@ -1,43 +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="text"
-                                   name="$!struts.htmlEncode($parameters.name)"
-#if ($parameters.size)             
size="$!struts.htmlEncode($parameters.size)"            #end
-#if ($parameters.maxlength)        
maxlength="$!struts.htmlEncode($parameters.maxlength)"  #end
-#if ($parameters.nameValue)        
value="$!struts.htmlEncode($parameters.nameValue)"      #end
-#if ($parameters.disabled && $parameters.disabled == true)
-                                   disabled="disabled"                         
             #end
-#if ($parameters.readonly)         readonly="readonly"                         
             #end
-#if ($parameters.tabindex)         
tabindex="$!struts.htmlEncode($parameters.tabindex)"    #end
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"       #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/><br />
-
-#if ($parameters.list)
-<select 
onChange="this.form.elements['$!struts.htmlEncode($parameters.name)'].value=this.options[this.selectedIndex].value"
-     #if ($parameters.disabled == true) disabled="disabled" #end
->
-#foreach ($param in $parameters.list)
-    <option value="$!struts.htmlEncode($param)"#if ($parameters.name == 
$param) selected="selected"#end>$!struts.htmlEncode($param)</option>
-#end
-</select>#end
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/debug.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/debug.vm
deleted file mode 100644
index d65d091..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/debug.vm
+++ /dev/null
@@ -1,85 +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 type="text/javascript">
-<!--
-    function toggleDebug(debugId) {
-        var debugDiv = document.getElementById(debugId);
-        if (debugDiv) {
-            var display = debugDiv.style.display;
-            if (display == 'none') {
-                debugDiv.style.display = 'block';
-            } else if (display == 'block') {
-                debugDiv.style.display = 'none';
-            }
-        }
-    }
--->
-</script>
-<p />
-
-#set ($id = $parameters.id)
-#if ($id) #else #set ($id = 'debug') #end
-<a href="#" onclick="toggleDebug('$id');return false;">[Debug]</a>
-<div style="display:none" id="$id">
-<h2>Struts ValueStack Debug</h2>
-<p />
-
-#set($contextMap = $stack.context)
-
-<h3>Value Stack Contents</h3>
-#set ($stackContents = $parameters.stackValues)
-<table border="0" cellpadding="5" cellspacing="0" width="100%" 
bgcolor="#DDDDDD">
-    <tr><th>Object</th><th>Property Name</th><th>Property Value</th></tr>
-
-    #set ($index = 1)
-    #foreach ($stackObject in $stackContents)
-    <tr>
-        <td rowspan="$stackObject.value.size()">$stackObject.key</td>
-        #set ($renderRow = false)
-        #set ($propertyMap = $stackObject.value)
-        #foreach ($propertyName in $propertyMap.keySet())
-            #if ($renderRow == true)<tr>#else #set ($renderRow = true) #end
-        <td bgcolor="#if (($index % 2) == 
0)#BBBBBB#else#CCCCCC#end">$propertyName</td>
-        <td bgcolor="#if (($index % 2) == 
0)#BBBBBB#else#CCCCCC#end">$propertyMap.get($propertyName)</td>
-    </tr>
-            #set ($index = $index + 1)
-        #end
-    #end
-</table>
-
-<h3>Stack Context</h3>
-<i>These items are available using the #key notation</i>
-<table border="0" cellpadding="5" cellspacing="0" width="100%" 
bgcolor="#DDDDDD">
-    <tr>
-        <th>Key</th><th>Value</th>
-    </tr>
-
-    #set ($index = 1)
-    #foreach ($contextKey in $contextMap.keySet())
-    <tr bgcolor="#if (($index % 2) == 0)#BBBBBB#else#CCCCCC#end">
-        <td>$contextKey</td><td>$contextMap.get($contextKey)</td>
-    </tr>
-    #set ($index = $index + 1)
-    #end
-</table>
-<p />
-
-</div>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/doubleselect.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/doubleselect.vm
deleted file mode 100644
index 3b7ee7f..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/simple/doubleselect.vm
+++ /dev/null
@@ -1,108 +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.
- *#
-`#parse("/$parameters.templateDir/simple/select.vm")
-#set ( $startCount = 0)
-#if ($parameters.headerKey && $parameters.headerValue)
-    #set ( $startCount = $startCount + 1)
-#end
-#if ($parameters.emptyOption)
-    #set ( $startCount = $startCount + 1)
-#end
-
-<br />
-<select name="$!struts.htmlEncode($parameters.doubleName)"
-    #if ($parameters.disabled)         disabled="disabled"                     
                    #end
-    #if ($parameters.doubleTabindex)   
tabindex="$!struts.htmlEncode($parameters.doubleTabindex)" #end
-    #if ($parameters.doubleId)         
id="$!struts.htmlEncode($parameters.doubleId)"             #end
-    #if ($parameters.multiple)         multiple="multiple"                     
                    #end
-    #if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"          #end
-    #if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"          #end
->
-</select>
-<script type="text/javascript">
-#set( $itemCount = $startCount )
-var $!struts.htmlEncode($parameters.name)Group = new 
Array($!{parameters.listSize} + $startCount);
-for (i = 0; i < ($!{parameters.listSize} + $startCount); i++)
-$!struts.htmlEncode($parameters.name)Group[i] = new Array();
-#foreach( $item in $items )
-    $stack.push($item)
-    #if( $parameters.listKey )
-        #set( $itemKey = $stack.findValue($parameters.listKey) )
-    #else
-        #set( $itemKey = $item )
-    #end
-    #if( $parameters.listValue )
-        #set( $itemValue  = $stack.findValue($parameters.listValue) )
-    #else
-        #set( $itemValue = $item )
-    #end
-    #set( $doubleItems = $stack.findValue($parameters.doubleList) )
-    #set( $doubleItemCount = 0 )
-    #if( $doubleItems )
-        #foreach( $doubleItem in $doubleItems )
-            $stack.push($doubleItem)
-            #if( $parameters.doubleListKey )
-                #set( $doubleItemKey = 
$stack.findValue($parameters.doubleListKey) )
-            #else
-                #set( $doubleItemKey = $doubleItem )
-            #end
-            #if( $parameters.doubleListValue )
-                #set( $doubleItemValue  = 
$stack.findValue($parameters.doubleListValue) )
-            #else
-                #set( $doubleItemValue = $doubleItem )
-            #end
-            
$!struts.htmlEncode($parameters.name)Group[$itemCount][$doubleItemCount] = new 
Option("$doubleItemKey", "$doubleItemValue");
-            #set( $doubleItemCount = $doubleItemCount + 1 )
-            #set ($trash = $stack.pop())
-        #end
-        #set( $itemCount = $itemCount + 1 )
-    #end
-    #set ($trash = $stack.pop())
-#end
-var $!struts.htmlEncode($parameters.name)Temp = 
document.$!struts.htmlEncode(${parameters.formName}).$!struts.htmlEncode(${parameters.doubleName});
-#set( $itemCount = $startCount )
-#set( $redirectTo = 0 )
-#foreach( $item in $items )
-    $stack.push($item)
-    #if( $parameters.listValue )
-        #set( $itemValue  = $stack.findValue($parameters.listValue) )
-    #else
-        #set( $itemValue = $item )
-    #end
-    #if( $tag.contains($parameters.nameValue, $itemKey) )
-        #set( $redirectTo = $itemCount )
-    #end
-    #set( $itemCount = $itemCount + 1 )
-    #set ($trash = $stack.pop())
-#end
-$!{struts.htmlEncode($parameters.name)}Redirect($redirectTo);
-function $!{struts.htmlEncode($parameters.name)}Redirect(x) {
-    for (m = $!{struts.htmlEncode($parameters.name)}Temp.options.length - 1; m 
>= 0; m--)
-        $!{struts.htmlEncode($parameters.name)}Temp.remove(m);
-
-    for (i = 0; i < $!{parameters.name}Group[x].length; i++) {
-        $!{struts.htmlEncode($parameters.name)}Temp.options[i] = new 
Option($!{struts.htmlEncode($parameters.name)}Group[x][i].text, 
$!{struts.htmlEncode($parameters.name)}Group[x][i].value);
-    }
-
-    if ($!{parameters.name}Temp.options.length > 0)
-        $!{struts.htmlEncode($parameters.name)}Temp.options[0].selected = true;
-}
-</script>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/empty.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/empty.vm
deleted file mode 100644
index 7627ce1..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/empty.vm
+++ /dev/null
@@ -1,20 +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.
- *#
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/file.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/file.vm
deleted file mode 100644
index 129cab5..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/file.vm
+++ /dev/null
@@ -1,32 +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="file"
-                                   name="$!struts.htmlEncode($parameters.name)"
-#if ($parameters.size)             
size="$!struts.htmlEncode($parameters.size)"            #end
-#if ($parameters.nameValue)        
value="$!struts.htmlEncode($parameters.nameValue)"      #end
-#if ($parameters.disabled && $parameters.disabled == true)
-                                   disabled="disabled"                         
             #end
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.accept)           
accept="$!struts.htmlEncode($parameters.accept)"        #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"       #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/form-close.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/form-close.vm
deleted file mode 100644
index dc96bcc..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/form-close.vm
+++ /dev/null
@@ -1,21 +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>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/form.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/form.vm
deleted file mode 100644
index 59ec46d..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/form.vm
+++ /dev/null
@@ -1,32 +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.namespace) namespace="$!parameters.namespace"                 
 #end
-#if ($parameters.id)        id="$!struts.htmlEncode($parameters.id)"           
#end
-#if ($parameters.name)      name="$!struts.htmlEncode($parameters.name)"       
#end
-#if ($parameters.action)    action="$!struts.htmlEncode($parameters.action)"   
#end
-#if ($parameters.target)    target="$!struts.htmlEncode($parameters.target)"   
#end
-#if ($parameters.method)    method="$!struts.htmlEncode($parameters.method)"   
#end
-#if ($parameters.enctype)   enctype="$!struts.htmlEncode($parameters.enctype)" 
#end
-#if ($parameters.cssClass)  class="$!struts.htmlEncode($parameters.cssClass)"  
#end
-#if ($parameters.cssStyle)  style="$!struts.htmlEncode($parameters.cssStyle)"  
#end
->
-
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/hidden.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/hidden.vm
deleted file mode 100644
index 672b210..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/hidden.vm
+++ /dev/null
@@ -1,28 +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"
-    #if ($parameters.name)      name="$!struts.htmlEncode($parameters.name)"   
    #end
-    #if ($parameters.nameValue) 
value="$!struts.htmlEncode($parameters.nameValue)" #end
-    #if ($parameters.cssClass)  
class="$!struts.htmlEncode($parameters.cssClass)"  #end
-    #if ($parameters.cssStyle)  
style="$!struts.htmlEncode($parameters.cssStyle)"  #end
-    #if ($parameters.id)        id="$!struts.htmlEncode($parameters.id)"       
    #end
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/label.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/label.vm
deleted file mode 100644
index 008e519..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/label.vm
+++ /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.
- *#
-<label
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"       #end
-#if ($parameters.for)              for="$!struts.htmlEncode($parameters.for)"  
            #end
->#if 
($parameters.nameValue)$!struts.htmlEncode($parameters.nameValue)#end</label>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/password.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/password.vm
deleted file mode 100644
index 0a9bc1e..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/password.vm
+++ /dev/null
@@ -1,34 +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"
-                                   name="$!struts.htmlEncode($parameters.name)"
-#if ($parameters.size)             
size="$!struts.htmlEncode($parameters.size)"            #end
-#if ($parameters.maxlength)        
maxlength="$!struts.htmlEncode($parameters.maxlength)"  #end
-#if ($parameters.nameValue && $parameters.showPassword && 
$parameters.showPassword == true)
-                                   
value="$!struts.htmlEncode($parameters.nameValue)"      #end
-#if ($parameters.disabled && $parameters.disabled == true)
-                                   disabled="disabled"                         
             #end
-#if ($parameters.readonly)         readonly="readonly"                         
             #end
-#if ($parameters.tabindex)         
tabindex="$!struts.htmlEncode($parameters.tabindex)"    #end
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/radiomap.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/radiomap.vm
deleted file mode 100644
index 6664395..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/radiomap.vm
+++ /dev/null
@@ -1,55 +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.
- *#
-#set( $items = $parameters.list )
-#if( $items )
-    #foreach( $item in $items )
-        $stack.push($item)
-
-        #if( $parameters.listKey )
-            #set( $itemKey = $stack.findValue($parameters.listKey) )
-        #else
-            #set( $itemKey = $item )
-        #end
-
-        #if( $parameters.listValue )
-            #set( $itemValue  = $stack.findValue($parameters.listValue) )
-        #else
-            #set( $itemValue = $item )
-        #end
-
-        <input
-            type="radio"
-            #if( $tag.contains($parameters.nameValue, $itemKey) 
)checked="checked"#end
-            #if ($parameters.name)
-                                        
name="$!struts.htmlEncode($parameters.name)"
-                                        
id="$!struts.htmlEncode($parameters.name)$!struts.htmlEncode($itemKey)"
-            #end
-            #if ($itemKey)              value="$!struts.htmlEncode($itemKey)"  
              #end
-            #if ($parameters.disabled)  disabled="disabled"                    
               #end
-            #if ($parameters.tabindex)  
tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
-            #if ($parameters.cssClass)  
class="$!struts.htmlEncode($parameters.cssClass)"    #end
-            #if ($parameters.cssStyle)  
style="$!struts.htmlEncode($parameters.cssStyle)"    #end
-            #parse("/$parameters.templateDir/simple/scripting-events.vm")
-        /><label 
for="$!struts.htmlEncode($parameters.name)$!struts.htmlEncode($itemKey)">$!itemValue</label>
-
-        #set ($trash = $stack.pop())
-    #end
-#end
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/scripting-events.vm
 
b/plugins/velocity/src/main/resources/template/velocity/simple/scripting-events.vm
deleted file mode 100644
index de9ea10..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/simple/scripting-events.vm
+++ /dev/null
@@ -1,34 +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="$!struts.htmlEncode($parameters.onclick)"         #end
-#if ($parameters.ondblclick)  
ondblclick="$!struts.htmlEncode($parameters.ondblclick)"   #end
-#if ($parameters.onmousedown) 
onmousedown="$!struts.htmlEncode($parameters.onmousedown)" #end
-#if ($parameters.onmouseup)   
onmouseup="$!struts.htmlEncode($parameters.onmouseup)"     #end
-#if ($parameters.onmouseover) 
onmouseover="$!struts.htmlEncode($parameters.onmouseover)" #end
-#if ($parameters.onmousemove) 
onmousemove="$!struts.htmlEncode($parameters.onmousemove)" #end
-#if ($parameters.onmouseout)  
onmouseout="$!struts.htmlEncode($parameters.onmouseout)"   #end
-#if ($parameters.onfocus)     
onfocus="$!struts.htmlEncode($parameters.onfocus)"         #end
-#if ($parameters.onblur)      onblur="$!struts.htmlEncode($parameters.onblur)" 
          #end
-#if ($parameters.onkeypress)  
onkeypress="$!struts.htmlEncode($parameters.onkeypress)"   #end
-#if ($parameters.onkeydown)   
onkeydown="$!struts.htmlEncode($parameters.onkeydown)"     #end
-#if ($parameters.onkeyup)     
onkeyup="$!struts.htmlEncode($parameters.onkeyup)"         #end
-#if ($parameters.onselect)    
onselect="$!struts.htmlEncode($parameters.onselect)"       #end
-#if ($parameters.onchange)    
onchange="$!struts.htmlEncode($parameters.onchange)"       #end
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/select.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/select.vm
deleted file mode 100644
index 4e7fd8e..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/select.vm
+++ /dev/null
@@ -1,63 +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.
- *#
-<select name="$!struts.htmlEncode($parameters.name)"
-    #if ($parameters.size)             
size="$!struts.htmlEncode($parameters.size)"         #end
-    #if ($parameters.disabled)         disabled="disabled"                     
              #end
-    #if ($parameters.tabindex)         
tabindex="$!struts.htmlEncode($parameters.tabindex)" #end
-    #if ($parameters.id)               
id="$!struts.htmlEncode($parameters.id)"             #end
-    #if ($parameters.multiple)         multiple="multiple"                     
              #end
-    #if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"    #end
-    #if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"    #end
-    #parse("/$parameters.templateDir/simple/scripting-events.vm")
->
-
-#if ($parameters.headerKey && $parameters.headerValue)
-    <option 
value="$!struts.htmlEncode($parameters.headerKey)">$!struts.htmlEncode($parameters.headerValue)</option>
-#end
-
-#if ($parameters.emptyOption)
-    <option value=""></option>
-#end
-
-#set( $items = $parameters.list )
-#if( $items )
-    #foreach( $item in $items )
-        $stack.push($item)
-
-        #if( $parameters.listKey )
-            #set( $itemKey = $stack.findValue($parameters.listKey) )
-        #else
-            #set( $itemKey = $item )
-        #end
-
-        #if( $parameters.listValue )
-            #set( $itemValue = $stack.findValue($parameters.listValue) )
-        #else
-            #set( $itemValue = $item )
-        #end
-
-        <option value="$!struts.htmlEncode($itemKey)"#if( 
$tag.contains($parameters.nameValue, $itemKey) ) 
selected="selected"#end>$!struts.htmlEncode($itemValue)</option>
-
-        #set ($trash = $stack.pop())
-    #end
-#end
-
-</select>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/submit.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/submit.vm
deleted file mode 100644
index 07f4652..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/submit.vm
+++ /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.
- *#
-<input type="submit"
-#if ($parameters.name)       name="$!struts.htmlEncode($parameters.name)"      
     #end
-#if ($parameters.nameValue)  
value="$!struts.htmlEncode($parameters.nameValue)"     #end
-#if ($parameters.cssClass)   class="$!struts.htmlEncode($parameters.cssClass)" 
     #end
-#if ($parameters.cssStyle)   style="$!struts.htmlEncode($parameters.cssStyle)" 
     #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/table.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/table.vm
deleted file mode 100644
index 0082020..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/table.vm
+++ /dev/null
@@ -1,101 +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.
- *#
-#set($webTable=$tag)
-#set($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">
-
-                            #*
-                                Show the visible column names.  Use the 
display name that can
-                                be set in the jsp.
-                            *#
-                            #foreach($curColumn in $webTable.Columns)
-                                #if($curColumn.isVisible())
-                                        <th>
-
-                                            #if($webTable.isSortable())
-                                                <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(($webTable.sortColumn == $curColumn.offset) && ($webTable.sortOrder == 
'ASC'))
-                                                                        <img 
src="#tag( URL "value='/images/sorted_asc.gif'")" border="0" align="bottom" />  
                                                                  #else
-                                                                        <a 
href="#bodytag( URL )
-                                                                               
     #param( $webTable.sortColumnLinkName $curColumn.offset)
-                                                                               
     #param( $webTable.sortOrderLinkName 'ASC')
-                                                                               
  #end">
-                                                                       <img 
src="#tag( URL "value='/images/unsorted_asc.gif'")" border="0" align="bottom" 
/></a>
-                                                                    #end
-                                                                </td>
-                                                                               
                            </tr>
-                                                                               
                            <tr>
-
-                                                                <td 
align="top">
-                                                                    
#if(($webTable.sortColumn == $curColumn.offset) && ($webTable.sortOrder == 
'DESC'))
-                                                                        <img 
src="#tag( URL "value='/images/sorted_desc.gif'")" border="0" align="top" />
-                                                                    #else
-                                                                        <a 
href="#bodytag( URL )
-                                                                               
     #param( $webTable.sortColumnLinkName $curColumn.offset)
-                                                                               
     #param( $webTable.sortOrderLinkName 'DESC')
-                                                                               
   #end"><img src="#tag( URL "value='/images/unsorted_desc.gif'")" border="0" 
align="top" /></a>
-                                                                    #end
-                                                                </td>
-                                                            </tr>
-                                                                               
                        </table>
-
-                                                                               
                    </td>
-                                                                               
                </tr>
-                                                                               
                </table>
-                                            #else
-                                                $curColumn.DisplayName
-                                            #end
-                                        </th>
-                                #end
-                            #end
-                            </tr>
-                             #foreach($curRow in $webTable.RowIterator)
-                                <tr #if($velocityCount % 2 == 1) 
bgcolor="EEEEFF" #else bgcolor="FFFFFF" #end/>
-                                #foreach($curColumn in $curRow)
-                                <td>$curColumn</td>
-
-                                #end
-                             #end
-                                               </table>
-                                       </td>
-                               </tr>
-                       </table>
-               </p>
-
-#end
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/text.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/text.vm
deleted file mode 100644
index 9dd8f30..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/text.vm
+++ /dev/null
@@ -1,34 +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="text"
-                                   name="$!struts.htmlEncode($parameters.name)"
-#if ($parameters.size)             
size="$!struts.htmlEncode($parameters.size)"            #end
-#if ($parameters.maxlength)        
maxlength="$!struts.htmlEncode($parameters.maxlength)"  #end
-#if ($parameters.nameValue)        
value="$!struts.htmlEncode($parameters.nameValue)"      #end
-#if ($parameters.disabled && $parameters.disabled == true)
-                                   disabled="disabled"                         
             #end
-#if ($parameters.readonly)         readonly="readonly"                         
             #end
-#if ($parameters.tabindex)         
tabindex="$!struts.htmlEncode($parameters.tabindex)"    #end
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"       #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
-/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/textarea.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/textarea.vm
deleted file mode 100644
index 7a51745..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/textarea.vm
+++ /dev/null
@@ -1,33 +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 name="$!struts.htmlEncode($parameters.name)"
-          cols="$!struts.htmlEncode($parameters.cols)"
-          rows="$!struts.htmlEncode($parameters.rows)"
-#if ($parameters.wrap)             
wrap="$!struts.htmlEncode($parameters.wrap)"            #end
-#if ($parameters.disabled && $parameters.disabled== true)
-                                   disabled="disabled"                         
             #end
-#if ($parameters.readonly)         readonly="readonly"                         
             #end
-#if ($parameters.tabindex)         
tabindex="$!struts.htmlEncode($parameters.tabindex)"    #end
-#if ($parameters.id)               id="$!struts.htmlEncode($parameters.id)"    
            #end
-#if ($parameters.cssClass)         
class="$!struts.htmlEncode($parameters.cssClass)"       #end
-#if ($parameters.cssStyle)         
style="$!struts.htmlEncode($parameters.cssStyle)"       #end
-#parse("/$parameters.templateDir/simple/scripting-events.vm")
->#if 
($parameters.nameValue)$!struts.htmlEncode($parameters.nameValue)#end</textarea>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/simple/token.vm 
b/plugins/velocity/src/main/resources/template/velocity/simple/token.vm
deleted file mode 100644
index 5e5d18d..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/simple/token.vm
+++ /dev/null
@@ -1,22 +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}" 
value="$struts.htmlEncode($!parameters.name)"/>
-<input type="hidden" name="$!parameters.name" 
value="$struts.htmlEncode($!parameters.token)"/>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/checkbox.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/checkbox.vm
deleted file mode 100644
index 9e77217..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/checkbox.vm
+++ /dev/null
@@ -1,39 +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( $fieldErrors.get($parameters.name) )
-  #set ($hasFieldErrors = $fieldErrors.get($parameters.name))
-  #foreach ($error in $fieldErrors.get($parameters.name))
-    <tr>
-        <td align="left" valign="top" colspan="2"><span 
class="errorMessage">$!error</span></td>
-    </tr>
-  #end
-#end
-
-<tr>
-    <td valign="top" colspan="2">
-#* Use an extra table so that the checkbox doesn't align with the other 
columns. *#
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td 
valign="middle">#parse("$!{tag.templateDir}/simple/checkbox.vm")</td>
-        <td width="100%" valign="middle"><label #if ($parameters.id) 
for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) 
class="checkboxErrorLabel"#else 
class="checkboxLabel"#end>$!struts.htmlEncode($parameters.label)</label></td>
-    </tr>
-</table>
-#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/checkboxlist.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/checkboxlist.vm
deleted file mode 100644
index 85cf568..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/checkboxlist.vm
+++ /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.
- *#
-#parse( "/$parameters.templateDir/xhtml/controlheader.vm" )
-#parse( "/$parameters.templateDir/simple/checkboxlist.vm" )
-#parse( "/$parameters.templateDir/xhtml/controlfooter.vm" )
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/combobox.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/combobox.vm
deleted file mode 100644
index d47f5e9..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/combobox.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/combobox.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/controlfooter.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/controlfooter.vm
deleted file mode 100644
index b7ddce9..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/controlfooter.vm
+++ /dev/null
@@ -1,22 +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}</td>
-</tr>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/controlheader.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/controlheader.vm
deleted file mode 100644
index a07d787..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/controlheader.vm
+++ /dev/null
@@ -1,47 +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.
-#if( $fieldErrors.get($parameters.name) )
-  #set ($hasFieldErrors = $fieldErrors.get($parameters.name))
-  #foreach ($error in $fieldErrors.get($parameters.name))
-    <tr errorFor="$parameters.id">
-        #if ($parameters.labelposition == 'top')<td align="left" valign="top" 
colspan="2">#else<td align="center" valign="top" colspan="2">#end<span 
class="errorMessage">$!struts.htmlEncode($error)</span></td>
-    </tr>
-  #end
-#end
-## if the label position is top,
-## then give the label it's own row in the table
-<tr>
-#if ($parameters.labelposition && $parameters.labelposition == 'top')<td 
align="left" valign="top" colspan="2">#else<td align="right" 
valign="top">#end#if ($parameters.label)<label #if ($parameters.id) 
for="$!struts.htmlEncode($parameters.id)"#end#if ($hasFieldErrors) 
class="errorLabel"#else class="label"#end>#if ($parameters.required)<span 
class="required">*</span>#end$!struts.htmlEncode($parameters.label):</label>#end</td>
-## add the extra row
-#if ($parameters.labelposition && $parameters.labelposition == 'top')
-</tr>
-<tr>
-#end
-#if ($parameters.form.validate && $parameters.form.validate == true)
-    #if ($parameters.onblur)
-        #set ($parameters.onblur = "validate(this);${parameters.onblur}")
-    #else
-        #set ($parameters.onblur = "validate(this)")
-    #end
-#end
-    <td>
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/debug.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/debug.vm
deleted file mode 100644
index f4e2cd9..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/debug.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/debug.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/doubleselect.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/doubleselect.vm
deleted file mode 100644
index d5c894f..0000000
--- 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/doubleselect.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/doubleselect.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/empty.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/empty.vm
deleted file mode 100644
index 7627ce1..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/empty.vm
+++ /dev/null
@@ -1,20 +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.
- *#
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/file.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/file.vm
deleted file mode 100644
index 65750ac..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/file.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/file.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/form-close.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/form-close.vm
deleted file mode 100644
index 4b5b26b..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/form-close.vm
+++ /dev/null
@@ -1,22 +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>
-#parse("/$parameters.templateDir/simple/form-close.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/form.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/form.vm
deleted file mode 100644
index 1beb97e..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/form.vm
+++ /dev/null
@@ -1,28 +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.validate && $parameters.validate == true)
-<script src="${base}/struts/validationClient.js"></script>
-<script src="${base}/dwr/interface/validator.js"></script>
-<script src="${base}/dwr/engine.js"></script>
-<script src="${base}/struts/template/xhtml/validation.js"></script>
-#end
-#parse("/$parameters.templateDir/simple/form.vm")
-<table class="wwFormTable">
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/hidden.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/hidden.vm
deleted file mode 100644
index 5dc922d..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/hidden.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/simple/hidden.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/label.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/label.vm
deleted file mode 100644
index 08c8e9f..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/label.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/label.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/password.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/password.vm
deleted file mode 100644
index 211dfbe..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/password.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/password.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/radiomap.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/radiomap.vm
deleted file mode 100644
index 793e15f..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/radiomap.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/radiomap.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/select.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/select.vm
deleted file mode 100644
index 001ec89..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/select.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/select.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/submit.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/submit.vm
deleted file mode 100644
index 0ec2837..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/submit.vm
+++ /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.
- *#
-<tr>
-    <td colspan="2"><div #if ($parameters.align) 
align="$!struts.htmlEncode($parameters.align)" #end
->#parse("/$parameters.templateDir/simple/submit.vm")</div>#parse( 
"/$parameters.templateDir/xhtml/controlfooter.vm" )
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/table.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/table.vm
deleted file mode 100644
index 78a9f4e..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/table.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/simple/table.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/text.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/text.vm
deleted file mode 100644
index 64a24be..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/text.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/text.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/textarea.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/textarea.vm
deleted file mode 100644
index a8514e6..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/textarea.vm
+++ /dev/null
@@ -1,22 +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.
- *#
-#parse("/$parameters.templateDir/xhtml/controlheader.vm")#parse("/$parameters.templateDir/simple/textarea.vm")#parse("/$parameters.templateDir/xhtml/controlfooter.vm")
-
diff --git 
a/plugins/velocity/src/main/resources/template/velocity/xhtml/token.vm 
b/plugins/velocity/src/main/resources/template/velocity/xhtml/token.vm
deleted file mode 100644
index 04d011d..0000000
--- a/plugins/velocity/src/main/resources/template/velocity/xhtml/token.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#parse("/$parameters.templateDir/simple/token.vm")