You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/05/22 12:58:32 UTC

[05/50] struts git commit: Moves deprecated plugins to struts-archive repo

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/tree.css
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/tree.css b/plugins/dojo/src/main/resources/org/apache/struts2/static/tree.css
deleted file mode 100644
index 832db6f..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/tree.css
+++ /dev/null
@@ -1,50 +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.
- */
-
-.dojoTree {
-	font: caption;
-	font-size: 11px;
-	font-weight: normal;
-	overflow: auto;
-}
-
-.dojoTreeNodeLabel {
-	padding: 1px 2px;
-	color: WindowText;
-	cursor: default;
-}
-
-.dojoTreeNodeLabel:hover {
-	text-decoration: underline;
-}
-
-.dojoTreeNodeLabelSelected {
-	background-color: Highlight;
-	color: HighlightText;
-}
-
-.dojoTree div {
-	white-space: nowrap;
-}
-
-.dojoTree img {
-	vertical-align: middle;
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/struts-plugin.xml b/plugins/dojo/src/main/resources/struts-plugin.xml
deleted file mode 100644
index 9f5a2c8..0000000
--- a/plugins/dojo/src/main/resources/struts-plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-/*
- * $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.
- */
--->
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
-    
-<struts>
-    <bean type="org.apache.struts2.views.TagLibraryDirectiveProvider" name="sx" class="org.apache.struts2.dojo.views.DojoTagLibrary" />
-    <bean type="org.apache.struts2.views.TagLibraryModelProvider" name="sx" class="org.apache.struts2.dojo.views.DojoTagLibrary" />
-</struts>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/a-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/a-close.ftl b/plugins/dojo/src/main/resources/template/ajax/a-close.ftl
deleted file mode 100644
index bafc474..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/a-close.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-</a>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/a.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/a.ftl b/plugins/dojo/src/main/resources/template/ajax/a.ftl
deleted file mode 100644
index e96bd43..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/a.ftl
+++ /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.
- */
--->
-<a dojoType="struts:BindAnchor"
-  <#if parameters.validate?exists>
-    validate="${parameters.validate?string?html}"<#rt/>
-  <#else>
-    validate="false"<#rt/>  
-  </#if>
-  <#if parameters.ajaxAfterValidation?exists>
-    ajaxAfterValidation="${parameters.ajaxAfterValidation?string?html}"<#rt/>
-  <#else>
-    ajaxAfterValidation="false"  
-  </#if>
-  <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-  <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl b/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
deleted file mode 100644
index bca706c..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
+++ /dev/null
@@ -1,106 +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.id?if_exists != "">
-  	id="${parameters.id?html}"<#rt/>
-  </#if>
-  <#if parameters.formId?if_exists != "">
-  	formId="${parameters.formId?html}"<#rt/>
-  </#if>
-  <#if parameters.formFilter?if_exists != "">
-  	formFilter="${parameters.formFilter?html}"<#rt/>
-  </#if>
-  <#if parameters.tabindex?if_exists != "">
-    tabindex="${parameters.tabindex?html}"<#rt/>
-  </#if>
-  <#if parameters.cssClass?if_exists != "">
-    class="${parameters.cssClass?html}"<#rt/>
-  </#if>
-  <#if parameters.cssStyle?if_exists != "">
-    style="${parameters.cssStyle?html}"<#rt/>
-  </#if>
-  <#if parameters.label?if_exists != "">
-    label="${parameters.label?html}"<#rt/>
-  </#if>
-  <#if parameters.title?if_exists != "">
-    title="${parameters.title?html}"<#rt/>
-  </#if>
-  <#if parameters.name?if_exists != "">
-  	name="${parameters.name?html}"<#rt/>
-  </#if>
-  <#if parameters.href?if_exists != "">
-  	href="${parameters.href}"<#rt/>
-  </#if>
-  <#if parameters.loadingText?if_exists != "">
-    loadingText="${parameters.loadingText?html}"<#rt/>
-  </#if>
-  <#if parameters.errorText?if_exists != "">
-    errorText="${parameters.errorText?html}"<#rt/>
-  </#if>
-  <#if parameters.executeScripts?exists>
-    executeScripts="${parameters.executeScripts?string?html}"<#rt/>
-  </#if>
-  <#if parameters.listenTopics?if_exists != "">
-    listenTopics="${parameters.listenTopics?html}"<#rt/>
-  </#if>
-   <#if parameters.notifyTopics?if_exists != "">
-    notifyTopics="${parameters.notifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.beforeNotifyTopics?if_exists != "">
-    beforeNotifyTopics="${parameters.beforeNotifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.afterNotifyTopics?if_exists != "">
-    afterNotifyTopics="${parameters.afterNotifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.errorNotifyTopics?if_exists != "">
-    errorNotifyTopics="${parameters.errorNotifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.targets?if_exists != "">
-    targets="${parameters.targets?html}"<#rt/>
-  </#if>
-  <#if parameters.handler?if_exists != "">
-    handler="${parameters.handler?html}"<#rt/>
-  </#if>
-  <#if parameters.indicator?if_exists != "">
-    indicator="${parameters.indicator?html}"<#rt/>
-  </#if>
-  <#if parameters.showErrorTransportText?exists>
-    showError="${parameters.showErrorTransportText?string?html}"<#rt/>
-  </#if>
-  <#if parameters.showLoadingText?exists>
-    showLoading="${parameters.showLoadingText?string?html}"<#rt/>
-  </#if>
-  <#if parameters.highlightColor?if_exists != "">
-    highlightColor="${parameters.highlightColor?html}"<#rt/>
-  </#if>
-  <#if parameters.highlightDuration?if_exists != "">
-    highlightDuration="${parameters.highlightDuration?html}"<#rt/>
-  </#if>
-  <#if parameters.separateScripts?exists>
-    scriptSeparation="${parameters.separateScripts?string?html}"<#rt/>
-  </#if>
-  <#if parameters.transport?if_exists != "">
-    transport="${parameters.transport?html}"<#rt/>
-  </#if>
-  <#if parameters.parseContent?exists>
-    parseContent="${parameters.parseContent?string?html}"<#rt/>
-  </#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
deleted file mode 100644
index 01d31e3..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
+++ /dev/null
@@ -1,180 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
-<#if parameters.href?exists>
-  <input dojoType="struts:ComboBox"<#rt/>
-  dataUrl="${parameters.href}"<#rt/>
-<#else>
-  <select dojoType="struts:ComboBox"<#rt/>
-</#if>
-<#if parameters.id?if_exists != "">
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?if_exists != "">
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?if_exists != "">
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.forceValidOption?exists>
- forceValidOption="${parameters.forceValidOption?string?html}"<#rt/>
-</#if>
-<#if parameters.searchType?if_exists != "">
- searchType="${parameters.searchType?html}"<#rt/>
-</#if>
-<#if parameters.autoComplete?exists>
- autoComplete="${parameters.autoComplete?string?html}"<#rt/>
-</#if>
-<#if parameters.delay?exists>
- searchDelay="${parameters.delay?c}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.dropdownWidth?exists>
- dropdownWidth="${parameters.dropdownWidth?c}"<#rt/>
-</#if>
-<#if parameters.dropdownHeight?exists>
- dropdownHeight="${parameters.dropdownHeight?c}"<#rt/>
-</#if>
-<#if parameters.name?if_exists != "">
- name="${parameters.name?html}"<#rt/>
-</#if>
-<#if parameters.get("size")?exists>
- size="${parameters.get("size")?html}"<#rt/>
-</#if>
-<#if parameters.keyName?if_exists != "">
- keyName="${parameters.keyName?html}"<#rt/>
-</#if>
-<#if parameters.maxlength?exists>
- maxlength="${parameters.maxlength?string?html}"<#rt/>
-</#if>
-<#if parameters.nameValue?if_exists != "">
- initialValue="${parameters.nameValue}"<#rt/>
-</#if>
-<#if parameters.nameKeyValue?if_exists != "">
- initialKey="${parameters.nameKeyValue}"<#rt/>
-</#if>
-<#if parameters.readonly?default(false)>
- readonly="readonly"<#rt/>
-</#if>
-<#if parameters.tabindex?exists>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.formId?if_exists != "">
- formId="${parameters.formId?html}"<#rt/>
-</#if>
-<#if parameters.formFilter?if_exists != "">
- formFilter="${parameters.formFilter?html}"<#rt/>
-</#if>
-<#if parameters.listenTopics?if_exists != "">
- listenTopics="${parameters.listenTopics?html}"<#rt/>
-</#if>
-<#if parameters.notifyTopics?if_exists != "">
- notifyTopics="${parameters.notifyTopics?html}"<#rt/>
-</#if>
-<#if parameters.beforeNotifyTopics?if_exists != "">
-  beforeNotifyTopics="${parameters.beforeNotifyTopics?html}"<#rt/>
-</#if>
-<#if parameters.afterNotifyTopics?if_exists != "">
-  afterNotifyTopics="${parameters.afterNotifyTopics?html}"<#rt/>
-</#if>
-<#if parameters.errorNotifyTopics?if_exists != "">
-  errorNotifyTopics="${parameters.errorNotifyTopics?html}"<#rt/>
-</#if>
-<#if parameters.valueNotifyTopics?if_exists != "">
-  valueNotifyTopics="${parameters.valueNotifyTopics?html}"<#rt/>
-</#if>
-<#if parameters.indicator?if_exists != "">
- indicator="${parameters.indicator?html}"<#rt/>
-</#if>
-<#if parameters.loadOnTextChange?default(false)>
- loadOnType="${parameters.loadOnTextChange?string?html}"<#rt/>
-</#if>
-<#if parameters.loadMinimumCount?exists>
- loadMinimum="${parameters.loadMinimumCount?c}"<#rt/>
-</#if>
-<#if parameters.showDownArrow?exists>
- visibleDownArrow="${parameters.showDownArrow?string?html}"<#rt/>
-</#if>
-<#if parameters.iconPath?if_exists != "">
- buttonSrc="<@s.url value='${parameters.iconPath}' encode="false" includeParams='none'/>"<#rt/>
-</#if>
-<#if parameters.templateCssPath?if_exists != "">
- templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
-</#if>
-<#if parameters.dataFieldName?if_exists != "">
- dataFieldName="${parameters.dataFieldName?html}"
-</#if>
-<#if parameters.searchLimit?if_exists != "">
- searchLimit="${parameters.searchLimit?html}"
-</#if>
-<#if parameters.transport?if_exists != "">
-  transport="${parameters.transport?html}"<#rt/>
-</#if>
-<#if parameters.preload?exists>
-  preload="${parameters.preload?string?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-<#if parameters.href?exists>
- />
-<#else>
- >
-</#if>
-<#if parameters.list?exists>
-	<#if (parameters.headerKey?exists && parameters.headerValue?exists)>
-		<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
-	</#if>
-	<#if parameters.emptyOption?default(false)>
-	    <option value=""></option>
-	</#if>
-    <@s.iterator value="parameters.list">
-    <#if parameters.listKey?exists>
-    	<#assign tmpListKey = stack.findString(parameters.listKey) />
-    <#else>
-    	<#assign tmpListKey = stack.findString('top') />
-    </#if>
-    <#if parameters.listValue?exists>
-    	<#assign tmpListValue = stack.findString(parameters.listValue) />
-    <#else>
-    	<#assign tmpListValue = stack.findString('top') />
-    </#if>
-    <option value="${tmpListKey?html}"<#rt/>
-        <#if (parameters.nameValue?exists && parameters.nameValue == tmpListKey)>
- selected="selected"<#rt/>
-        </#if>
-    ><#t/>
-            ${tmpListValue?html}<#t/>
-    </option><#lt/>
-    </...@s.iterator>
-  </select>
-</#if>
-<#if parameters.label?if_exists != "">
-	<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-</#if>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>
-
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/bind-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/bind-close.ftl b/plugins/dojo/src/main/resources/template/ajax/bind-close.ftl
deleted file mode 100644
index 6aeac9d..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/bind-close.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/bind.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/bind.ftl b/plugins/dojo/src/main/resources/template/ajax/bind.ftl
deleted file mode 100644
index bb37a5a..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/bind.ftl
+++ /dev/null
@@ -1,166 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#assign firstField=true >
-<script language="JavaScript" type="text/javascript">
-	dojo.addOnLoad(function() {
-		dojo.widget.createWidget("struts:BindEvent", {
-		    <#if parameters.sources?if_exists != "">
-		        <#assign firstField=false ><#t/>
-                "sources": "${parameters.sources?html}"<#t/>
-            </#if>
-            <#if parameters.events?if_exists != "">
-                <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-                "events": "${parameters.events?html}"<#t/>
-            </#if>
-			<#if parameters.id?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			  	"id": "${parameters.id?html}"<#t/>
-		    </#if>
-		    <#if parameters.formId?if_exists != "">
-		        <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			  	"formId": "${parameters.formId?html}"<#t/>
-		    </#if>
-			<#if parameters.formFilter?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			  	"formFilter": "${parameters.formFilter?html}"<#t/>
-			</#if>
-			<#if parameters.href?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			  	"href": "${parameters.href}"<#t/>
-			</#if>
-			<#if parameters.loadingText?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "loadingText" : "${parameters.loadingText?html}"<#t/>
-		    </#if>
-			<#if parameters.errorText?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "errorText" : "${parameters.errorText?html}"<#t/>
-			</#if>
-			<#if parameters.executeScripts?exists>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "executeScripts": ${parameters.executeScripts?string?html}<#t/>
-			</#if>
-			<#if parameters.listenTopics?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "listenTopics": "${parameters.listenTopics?html}"<#t/>
-			</#if>
-			<#if parameters.notifyTopics?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "notifyTopics": "${parameters.notifyTopics?html}"<#t/>
-			</#if>
-			<#if parameters.beforeNotifyTopics?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "beforeNotifyTopics": "${parameters.beforeNotifyTopics?html}"<#t/>
-		    </#if>
-		    <#if parameters.afterNotifyTopics?if_exists != "">
-		        <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-		        "afterNotifyTopics": "${parameters.afterNotifyTopics?html}"<#t/>
-    		</#if>
-     		<#if parameters.errorNotifyTopics?if_exists != "">
-     		    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-		        "errorNotifyTopics": "${parameters.errorNotifyTopics?html}"<#t/>
-     		</#if>
-			<#if parameters.targets?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "targets": "${parameters.targets?html}"<#t/>
-			</#if>
-			<#if parameters.indicator?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "indicator": "${parameters.indicator?html}"<#t/>
-			</#if>
-			<#if parameters.showErrorTransportText?exists>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "showError": ${parameters.showErrorTransportText?string?html}<#t/>
-			</#if>
-			<#if parameters.showLoadingText?exists>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "showLoading": ${parameters.showLoadingText?string?html}<#t/>
-			</#if>
-			<#if parameters.handler?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "handler": "${parameters.handler?html}"<#t/>
-		    </#if>
-		    <#if parameters.highlightColor?if_exists != "">
-		        <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "highlightColor" : "${parameters.highlightColor?html}"<#t/>
-			</#if>
-			<#if parameters.highlightDuration?if_exists != "">
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "highlightDuration" : ${parameters.highlightDuration?html}<#t/>
-			</#if>
-			<#if parameters.validate?exists>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "validate": ${parameters.validate?string?html}<#t/>
-			<#else>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "validate": false
-			</#if>
-			<#if parameters.ajaxAfterValidation?exists>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "ajaxAfterValidation": ${parameters.ajaxAfterValidation?string?html}<#t/>
-			<#else>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-			    "ajaxAfterValidation": false
-			</#if>
-			<#if parameters.separateScripts?exists>
-			    <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-                "scriptSeparation": ${parameters.separateScripts?string?html}<#t/>
-            </#if>
-            <#if parameters.transport?if_exists != "">
-                <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-                "transport": "${parameters.transport?html}"<#t/>
-            </#if>
-            <#if parameters.parseContent?exists>
-                <#if !firstField>,</#if><#t/>
-                <#assign firstField=false ><#t/>
-                "parseContent": ${parameters.parseContent?string?html}<#t/>
-            </#if>
-		});
-	});
-</script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl b/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
deleted file mode 100644
index fc6e30e..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
+++ /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.label?if_exists != "">
-	<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
-</#if>
-<#if parameters.form?exists && parameters.form.validate?default(false) == true>
-	<#-- can't mutate the data model in freemarker -->
-    <#if parameters.onblur?exists>
-        ${tag.addParameter('onblur', "validate(this);${parameters.onblur}")}
-    <#else>
-        ${tag.addParameter('onblur', "validate(this);")}
-    </#if>
-</#if>
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
deleted file mode 100644
index 2cb33ac..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
+++ /dev/null
@@ -1,105 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
-<div
-   <#if parameters.type?if_exists == "date">
-     dojoType="struts:StrutsDatePicker"<#rt/>
-   <#else>
-     dojoType="struts:StrutsTimePicker"<#rt/>
-  </#if>
-  <#if parameters.id?if_exists != "">
-    id="${parameters.id?html}"<#rt/>
-  </#if>
-  <#if parameters.nameValue?if_exists != "">
-    value="${parameters.nameValue?html}"<#rt/>
-  </#if>
-  <#if parameters.language?if_exists != "">
-    lang="${parameters.language?html}"<#rt/>
-  </#if>
-  <#if parameters.name?if_exists != "">
-    name="${parameters.name?html}"<#rt/>
-    inputName="dojo.${parameters.name?html}"<#rt/>
-  </#if>
-  <#if parameters.displayWeeks?if_exists != "">
-    displayWeeks="${parameters.displayWeeks?html}"<#rt/>
-  </#if>
-  <#if parameters.adjustWeeks?exists>
-    adjustWeeks="${parameters.adjustWeeks?string?html}"<#rt/>
-  </#if>
-  <#if parameters.startDate?if_exists != "">
-    startDate="${parameters.startDate?html}"<#rt/>
-  </#if>
-  <#if parameters.endDate?if_exists != "">
-    endDate="${parameters.endDate?html}"<#rt/>
-  </#if>
-  <#if parameters.weekStartsOn?if_exists != "">
-    weekStartsOn="${parameters.weekStartsOn?html}"<#rt/>
-  </#if>
-  <#if parameters.staticDisplay?exists>
-    staticDisplay="${parameters.staticDisplay?string?html}"<#rt/>
-  </#if>
-  <#if parameters.dayWidth?if_exists != "">
-    dayWidth="${parameters.dayWidth?html}"<#rt/>
-  </#if>
-  <#if parameters.tabindex?if_exists != "">
-    tabindex="${parameters.tabindex?html}"<#rt/>
-  </#if>
-  <#if parameters.cssClass?if_exists != "">
-    class="${parameters.cssClass?html}"<#rt/>
-  </#if>
-  <#if parameters.cssStyle?if_exists != "">
-    style="${parameters.cssStyle?html}"<#rt/>
-  </#if>
-  <#if parameters.iconPath?if_exists != "">
-    iconURL="<@s.url value='${parameters.iconPath}' encode="false" includeParams='none'/>"<#rt/>
-  </#if>
-  <#if parameters.formatLength?if_exists != "">
-    formatLength="${parameters.formatLength?html}"<#rt/>
-  </#if>
-  <#if parameters.displayFormat?if_exists != "">
-    displayFormat="${parameters.displayFormat?html}"<#rt/>
-  </#if>
-  <#if parameters.toggleType?if_exists != "">
-    containerToggle="${parameters.toggleType?html}"<#rt/>
-  </#if>
-  <#if parameters.toggleDuration?exists>
-    containerToggleDuration="${parameters.toggleDuration?string?html}"<#rt/>
-  </#if>
-  <#if parameters.templateCssPath?if_exists != "">
-	templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
-  </#if>
-  <#if parameters.valueNotifyTopics?if_exists != "">
-	valueNotifyTopics="${parameters.valueNotifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.disabled?default(false)>
-    disabled="disabled"<#rt/>
-  </#if>
-  saveFormat="rfc"<#rt/>
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-></div>
-<#if parameters.label?if_exists != "">
-	<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-</#if>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/div-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/div-close.ftl b/plugins/dojo/src/main/resources/template/ajax/div-close.ftl
deleted file mode 100644
index b6765e6..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/div-close.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-</div>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/div.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/div.ftl b/plugins/dojo/src/main/resources/template/ajax/div.ftl
deleted file mode 100644
index 78bb7d9..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/div.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<div dojoType="struts:BindDiv"
-  <#if parameters.delay?exists>
-    delay="${parameters.delay?c}"<#rt/>
-  </#if>
-  <#if parameters.updateFreq?exists>
-    updateFreq="${parameters.updateFreq?c}"<#rt/>
-  </#if>
-  <#if parameters.autoStart?exists>
-    autoStart="${parameters.autoStart?string?html}"<#rt/>
-  </#if>
-  <#if parameters.closable?exists>
-    closable="${parameters.closable?string?html}"<#rt/>
-  </#if>
-  <#if parameters.startTimerListenTopics?if_exists != "">
-    startTimerListenTopics="${parameters.startTimerListenTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.stopTimerListenTopics?if_exists != "">
-    stopTimerListenTopics="${parameters.stopTimerListenTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.refreshOnShow?exists>
-    refreshOnShow="${parameters.refreshOnShow?string?html}"<#rt/>
-  </#if>
-  <#if parameters.preload?exists>
-    preload="${parameters.preload?string?html}"<#rt/>
-  </#if>
-  <#if parameters.disabled?default(false)>
-    disabled="disabled"<#rt/>
-  </#if>
-  <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-  <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js b/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
deleted file mode 100644
index f2b40c5..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
+++ /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.
- */
-
-dojo.require("dojo.io.BrowserIO");
-dojo.require("dojo.event.topic");
-
-dojo.hostenv.setModulePrefix('struts', 'struts');
-dojo.require('dojo.widget.*');
-dojo.widget.manager.registerWidgetPackage('struts.widget');
-
-dojo.require("struts.widget.*");
-dojo.require("dojo.widget.Editor2");

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/head.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/head.ftl b/plugins/dojo/src/main/resources/template/ajax/head.ftl
deleted file mode 100644
index 95be29e..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/head.ftl
+++ /dev/null
@@ -1,81 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<script language="JavaScript" type="text/javascript">
-    // Dojo configuration
-    djConfig = {
-        isDebug: ${parameters.debug?default(false)?string},
-        bindEncoding: "${parameters.encoding}"
-        <#if parameters.baseRelativePath?if_exists != "">
-          ,baseRelativePath: "<@s.url value='${parameters.baseRelativePath}' includeParams='none' encode='false' />"
-          ,baseScriptUri: "<@s.url value='${parameters.baseRelativePath}' includeParams='none' encode='false' />"
-        <#else>
-          ,baseRelativePath: "${base}/struts/dojo/"
-          ,baseScriptUri: "${base}/struts/dojo/"
-        </#if>  
-        <#if parameters.locale?if_exists != "">
-          ,locale: "${parameters.locale}"
-        </#if>
-        <#if parameters.extraLocales?exists>
-          ,extraLocale: [
-        	<#list parameters.extraLocales as locale>
-        		"${locale}"<#if locale_has_next>,</#if>
-        	</#list>
-          ]
-        </#if>
-         ,parseWidgets : ${parameters.parseContent?string}
-        
-    };
-</script>
-
-<#if parameters.compressed?default(true)>
-  <#assign dojoFile="dojo.js">
-<#else>
-  <#assign dojoFile="dojo.js.uncompressed.js">
-</#if>
-
-<#if parameters.cache?default(true)>
-  <#assign profile="struts_">
-<#else>
-  <#assign profile="">
-</#if>           
-
-<#if parameters.baseRelativePath?if_exists != "">
-  <script language="JavaScript" type="text/javascript"
-        src="<@s.url value='${parameters.baseRelativePath}/${profile}${dojoFile}' includeParams='none' encode='false'  />"></script>
-<#else>
-  <script language="JavaScript" type="text/javascript"
-        src="${base}/struts/dojo/${profile}${dojoFile}"></script>
-</#if>  
-
-<script language="JavaScript" type="text/javascript"
-        src="${base}/struts/ajax/dojoRequire.js"></script>
-<#if parameters.debug?default(false)>
-<script language="JavaScript" type="text/javascript">
-    dojo.hostenv.writeIncludes(true);
-</script>     
-</#if>        
-<link rel="stylesheet" href="${base}/struts/xhtml/styles.css" type="text/css"/>
-
-<script language="JavaScript" src="${base}/struts/utils.js" type="text/javascript"></script>
-<script language="JavaScript" src="${base}/struts/xhtml/validation.js" type="text/javascript"></script>
-<script language="JavaScript" src="${base}/struts/css_xhtml/validation.js" type="text/javascript"></script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/submit-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/submit-close.ftl b/plugins/dojo/src/main/resources/template/ajax/submit-close.ftl
deleted file mode 100644
index 2484efa..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/submit-close.ftl
+++ /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.
- */
--->
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/submit.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/submit.ftl b/plugins/dojo/src/main/resources/template/ajax/submit.ftl
deleted file mode 100644
index 4a4b3ea..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/submit.ftl
+++ /dev/null
@@ -1,105 +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.parentTheme?default('') == 'xhtml'>
-  <tr>
-      <td colspan="2"><div <#rt/>
-  <#if parameters.align?exists>
-      align="${parameters.align?html}"<#t/>
-  </#if>
-  ><#t/>
-<#elseif parameters.parentTheme?default('') == 'css_xhtml'>
-  <#if parameters.labelposition?default("top") == 'top'>
-    <div <#rt/>
-  <#else>
-    <span <#rt/>
-  </#if>
-  <#if parameters.align?exists>
-    align="${parameters.align?html}"<#t/>
-  </#if>
-  <#if parameters.id?exists>
-    id="wwctrl_${parameters.id}"<#rt/>
-  </#if>
-  ><#t/>
-</#if>
-
-<#if parameters.type?exists && parameters.type=="button">
-  <input type="button" dojoType="struts:Bind" events="onclick"<#rt/>
-  <#include "/${parameters.templateDir}/ajax/ajax-common.ftl"/>
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
-  <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-  <#if parameters.label?if_exists != "">
-     value="${parameters.label?html}"<#rt/>
-  </#if>
-  <#if parameters.disabled?default(false)>
-    disabled="disabled"<#rt/>
-  </#if>
- />
-<#else>
-  <#if parameters.type?exists && parameters.type=="image">
-    <input type="image" dojoType="struts:Bind" events="onclick"<#rt/>
-    <#if parameters.label?if_exists != "">
-     alt="${parameters.label?html}"<#rt/>
-    </#if>
-    <#if parameters.src?if_exists != "">
-     src="${parameters.src?html}"<#rt/>
-    </#if>
-  <#else>
-    <input type="submit" dojoType="struts:Bind" events="onclick"<#rt/>
-  </#if>
-    <#if parameters.nameValue?if_exists != "">
-     value="${parameters.nameValue?html}"<#rt/>
-    </#if>
-    <#if parameters.disabled?default(false)>
-     disabled="disabled"<#rt/>
-    </#if>
-    <#if parameters.value?if_exists != "">
-     value="${parameters.value?html}"<#rt/>
-    </#if>
-    <#if parameters.validate?exists>
-     validate="${parameters.validate?string?html}"<#rt/>
-    <#else>
-     validate="false"<#rt/>  
-    </#if>
-    <#if parameters.ajaxAfterValidation?exists>
-     ajaxAfterValidation="${parameters.ajaxAfterValidation?string?html}"<#rt/>
-    <#else>
-     ajaxAfterValidation="false"  
-    </#if>
-    <#include "/${parameters.templateDir}/ajax/ajax-common.ftl"/>
-    <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-    <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-  />
-</#if>
-<#if parameters.parentTheme?default('') == 'xhtml'>
-  </div><#t/>
-  <#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
-<#elseif parameters.parentTheme?default('') == 'css_xhtml'>
-  <#if parameters.labelposition?default("top") == 'top'>
-    </div> <#t/>
-  <#else>
-    </span> <#t/>
-  </#if>  
-</#if>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/tab-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/tab-close.ftl b/plugins/dojo/src/main/resources/template/ajax/tab-close.ftl
deleted file mode 100644
index b6765e6..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/tab-close.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-</div>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/tab.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/tab.ftl b/plugins/dojo/src/main/resources/template/ajax/tab.ftl
deleted file mode 100644
index 36ee4ff..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/tab.ftl
+++ /dev/null
@@ -1,45 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<div id="${parameters.id}" cacheContent="false"
-  <#if parameters.title?if_exists != "">
-    label="${parameters.title?html}"<#rt/>
-  </#if>
-  <#if parameters.href?if_exists != "">
-    dojoType="LinkPane" <#rt/>
-    href="${parameters.href}"<#rt/>
-    <#else>
-    dojoType="ContentPane"<#rt/>
-  </#if>
-  <#if parameters.cssStyle?if_exists != "">
-    style="${parameters.cssStyle?html}"<#rt/>
-  </#if>
-  <#if parameters.cssClass?if_exists != "">
-    class="${parameters.cssClass?html}"<#rt/>
-  </#if>
-  <#if parameters.closeButton?if_exists != "">
-    closeButton="${parameters.closeButton?html}"<#rt/>
-  </#if>
-  <#if parameters.refreshOnShow?if_exists != "">
-    refreshOnShow="${parameters.refreshOnShow?html}"<#rt/>
-  </#if>
->

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/tabbedpanel-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/tabbedpanel-close.ftl b/plugins/dojo/src/main/resources/template/ajax/tabbedpanel-close.ftl
deleted file mode 100644
index b6765e6..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/tabbedpanel-close.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-</div>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl b/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl
deleted file mode 100644
index 1750b7e..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl
+++ /dev/null
@@ -1,87 +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.
- */
--->
-<link rel="stylesheet" href="${base}/struts/TabbedPanel.css" type="text/css"/>
-<#if parameters.useSelectedTabCookie?exists && parameters.useSelectedTabCookie=="true">
-<script type="text/javascript">
-  dojo.require("dojo.io.cookie");
-  dojo.addOnLoad (
-        function() {
-            var tabContainer = dojo.widget.byId("${parameters.escapedId?html}");
-
-            <#if !(parameters.selectedTab?if_exists != "")>
-            var selectedTab = dojo.io.cookie.getCookie("Struts2TabbedPanel_selectedTab_${parameters.escapedId?html}");
-            if (selectedTab) {
-                tabContainer.selectChild(selectedTab, tabContainer.correspondingPageButton);
-            }
-
-            </#if>
-            dojo.event.connect(tabContainer, "selectChild",
-                    function (evt) {
-                        dojo.io.cookie.setCookie("Struts2TabbedPanel_selectedTab_${parameters.escapedId?html}", evt.widgetId, 1, null, null, null);
-                    }
-                )
-            }
-        );
-</script>
-</#if>
-
-<div dojoType="struts:StrutsTabContainer"
-  <#if parameters.cssStyle?if_exists != "">
-    style="${parameters.cssStyle?html}"<#rt/>
-  </#if>
-  <#if parameters.id?if_exists != "">
-    id="${parameters.id?html}"<#rt/>
-  </#if>
-  <#if parameters.cssClass?if_exists != "">
-    class="${parameters.cssClass?html}"<#rt/>
-  </#if>
-  <#if parameters.selectedTab?if_exists != "">
-    selectedTab="${parameters.selectedTab?html}"<#rt/>
-  </#if>
-  <#if parameters.labelPosition?if_exists != "">
-    labelPosition="${parameters.labelPosition?html}"<#rt/>
-  </#if>
-  <#if parameters.closeButton?if_exists != "">
-    closeButton="${parameters.closeButton?html}"<#rt/>
-  </#if>
-  <#if parameters.doLayout?exists>
-    doLayout="${parameters.doLayout?string?html}"<#rt/>
-  </#if>
-  <#if parameters.label?if_exists != "">
-    label="${parameters.label?html}"<#rt/>
-  </#if>
-  <#if parameters.templateCssPath?exists>
-	templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
-  </#if>
-  <#if parameters.beforeSelectTabNotifyTopics?if_exists != "">
-    beforeSelectTabNotifyTopics="${parameters.beforeSelectTabNotifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.afterSelectTabNotifyTopics?if_exists != "">
-    afterSelectTabNotifyTopics="${parameters.afterSelectTabNotifyTopics?html}"<#rt/>
-  </#if>
-  <#if parameters.disabledTabCssClass?if_exists != "">
-    disabledTabCssClass="${parameters.disabledTabCssClass?html}"<#rt/>
-  </#if>
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-  <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/textarea.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/textarea.ftl b/plugins/dojo/src/main/resources/template/ajax/textarea.ftl
deleted file mode 100644
index 5b8ba50..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/textarea.ftl
+++ /dev/null
@@ -1,65 +0,0 @@
-<#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<textarea<#rt/>
- dojoType="Editor2"
-<#if parameters.editorControls?exists>
- items="${parameters.editorControls?html}"<#rt/>
-<#else>
- items="linkGroup;|;textGroup;|;justifyGroup;|;listGroup;|;indentGroup;|;colorGroup"
-</#if>
- name="${parameters.name?default("")?html}"<#rt/>
- cols="${parameters.cols?default("")?html}"<#rt/>
- rows="${parameters.rows?default("")?html}"<#rt/>
-<#if parameters.wrap?exists>
- wrap="${parameters.wrap?html}"<#rt/>
-</#if>
-<#if parameters.disabled?default(false)>
- disabled="disabled"<#rt/>
-</#if>
-<#if parameters.readonly?default(false)>
- readonly="readonly"<#rt/>
-</#if>
-<#if parameters.tabindex?exists>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.id?exists>
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title?exists>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-><#rt/>
-<#if parameters.nameValue?exists>
-<@s.property value="parameters.nameValue"/><#t/>
-</#if>
-</textarea>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/theme.properties
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/theme.properties b/plugins/dojo/src/main/resources/template/ajax/theme.properties
deleted file mode 100644
index b862fe5..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/theme.properties
+++ /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.
-#
-parent = xhtml
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/tree-close.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/tree-close.ftl b/plugins/dojo/src/main/resources/template/ajax/tree-close.ftl
deleted file mode 100644
index 427bdfd..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/tree-close.ftl
+++ /dev/null
@@ -1,36 +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.label?exists></div></#if></div>
-<#if parameters.pushId>
-<script language="JavaScript" type="text/javascript">
-    djConfig.searchIds.push("treeSelector_${parameters.id?default("")?html}");
-    djConfig.searchIds.push("${parameters.id?html}");
-    <#if parameters.childrenIds?exists>
-        djConfig.searchIds.push(<#rt>
-        <#list parameters.childrenIds as childId>
-            "${childId?html}"<#if childId_has_next>,</#if><#t>
-        </#list>
-        );<#t>
-    </#if>  
-</script>
-</#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/tree.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/tree.ftl b/plugins/dojo/src/main/resources/template/ajax/tree.ftl
deleted file mode 100644
index b7b9048..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/tree.ftl
+++ /dev/null
@@ -1,126 +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">
-        <!--
-        dojo.require("dojo.lang.*");
-        dojo.require("dojo.widget.*");
-        dojo.require("dojo.widget.Tree");
-        // dojo.hostenv.writeIncludes();
-        -->
- </script>
- <#if parameters.selectedNotifyTopics?exists || parameters.expandedNotifyTopics?exists
-      || parameters.collapsedNotifyTopics?exists>  
- <struts:StrutsTreeSelector 
-   id="treeSelector_${parameters.id?default("")}"
-   widgetId="treeSelector_${parameters.id?default("")}"
-  <#if parameters.selectedNotifyTopics?exists>
-  	selectedNotifyTopics="${parameters.selectedNotifyTopics?html}"
-  </#if> 
-  <#if parameters.expandedNotifyTopics?exists>
-  	expandedNotifyTopics="${parameters.expandedNotifyTopics?html}"
-  </#if> 
-  <#if parameters.collapsedNotifyTopics?exists>
-  	collapsedNotifyTopics="${parameters.collapsedNotifyTopics?html}"
-  </#if> 
-  >
- </struts:StrutsTreeSelector> 
- </#if>
-<div dojoType="struts:StrutsTree"   
-    <#if parameters.href?if_exists != "">
-    href="${parameters.href}"
-    </#if>
-    <#if parameters.errorNotifyTopics?if_exists != "">
-    errorNotifyTopics="${parameters.errorNotifyTopics?html}"<#rt/>
-    </#if>
-	<#if parameters.blankIconSrc?exists>
-	gridIconSrcT="<@s.url value='${parameters.blankIconSrc}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcL?exists>
-	gridIconSrcL="<@s.url value='${parameters.gridIconSrcL}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcV?exists>
-	gridIconSrcV="<@s.url value='${parameters.gridIconSrcV}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcP?exists>
-	gridIconSrcP="<@s.url value='${parameters.gridIconSrcP}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcC?exists>
-	gridIconSrcC="<@s.url value='${parameters.gridIconSrcC}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcX?exists>
-	gridIconSrcX="<@s.url value='${parameters.gridIconSrcX}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcY?exists>
-	gridIconSrcY="<@s.url value='${parameters.gridIconSrcY}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.gridIconSrcZ?exists>
-	gridIconSrcZ="<@s.url value='${parameters.gridIconSrcZ}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.expandIconSrcPlus?exists>
-	expandIconSrcPlus="<@s.url value='${parameters.expandIconSrcPlus}' includeParams='none'/>"
-	</#if>
-	<#if parameters.expandIconSrcMinus?exists>
-	expandIconSrcMinus="<@s.url value='${parameters.expandIconSrcMinus?html}' includeParams='none'/>"
-	</#if>
-	<#if parameters.iconWidth?exists>
-	iconWidth="<@s.url value='${parameters.iconWidth?html}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.iconHeight?exists>
-	iconHeight="<@s.url value='${parameters.iconHeight?html}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.toggleDuration?exists>
-	toggleDuration=${parameters.toggleDuration?c}
-	</#if>
-	<#if parameters.templateCssPath?exists>
-	templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
-	</#if>
-	<#if parameters.showGrid?exists>
-	showGrid="${parameters.showGrid?default(true)?string}"
-	</#if>
-	<#if parameters.showRootGrid?exists>
-	showRootGrid="${parameters.showRootGrid?default(true)?string}"
-	</#if>
-    <#if parameters.id?exists>
-    id="${parameters.id?html}"
-    </#if>
-    <#if parameters.selectedNotifyTopics?exists || parameters.expandedNotifyTopics?exists
-      || parameters.collapsedNotifyTopics?exists> 
-    selector="treeSelector_${parameters.id?default("")}"
-    </#if>
-    <#if parameters.toggle?exists>
-    toggle="${parameters.toggle?html}"
-    </#if>
-    >
-    <#if parameters.label?exists>
-    <div dojoType="struts:StrutsTreeNode" title="${parameters.label?html}"
-    <#if parameters.nodeIdProperty?exists>
-    id="${stack.findValue(parameters.nodeIdProperty)}"
-    <#else>
-    id="${parameters.id}_root"
-    </#if>
-    >
-    <#elseif parameters.rootNode?exists>
-    ${stack.push(parameters.rootNode)}
-    <#include "/${parameters.templateDir}/ajax/treenode-include.ftl" />
-    <#assign oldNode = stack.pop()/> <#-- pop the node off of the stack, but don't show it -->
-    </#if>

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

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl b/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
deleted file mode 100644
index 3eee2e3..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
+++ /dev/null
@@ -1,29 +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="struts:StrutsTreeNode" title="${stack.findValue(parameters.nodeTitleProperty)}" id="${stack.findValue(parameters.nodeIdProperty)}">
-<#list stack.findValue(parameters.childCollectionProperty.toString())! as child>
-    ${stack.push(child)}
-    <#include "/${parameters.templateDir}/ajax/treenode-include.ftl" />
-    <#assign oldNode = stack.pop() /> <#-- pop the node off of the stack, but don't show it -->
-</#list>
-</div>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/template/ajax/treenode.ftl
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/template/ajax/treenode.ftl b/plugins/dojo/src/main/resources/template/ajax/treenode.ftl
deleted file mode 100644
index bf39ece..0000000
--- a/plugins/dojo/src/main/resources/template/ajax/treenode.ftl
+++ /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.
- */
--->
-<div dojoType="struts:StrutsTreeNode" 
-	<#if parameters.childIconSrc?exists>
-	childIconSrc="<@s.url value='${parameters.childIconSrc}' includeParams='none' encode='false' />"
-	</#if>
-    <#if parameters.id?exists>id="${parameters.id?html}"</#if>
-    title="${parameters.label}">

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/profile/README
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/profile/README b/plugins/dojo/src/profile/README
deleted file mode 100644
index 7ed420b..0000000
--- a/plugins/dojo/src/profile/README
+++ /dev/null
@@ -1,14 +0,0 @@
-To build the Struts Dojo profile:
-
-1. Checkout Dojo from svn (${dojo} refers to dojo's root dir) (make sure that ${dojo} is on the same folder as ${struts})
-
-2. Copy struts.profile.js to ${dojo}/buildscripts/profiles
-
-3. Copy /plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/ComboBox.css to
-   ${dojo}/struts (Dojo build system doesn't resolve the relative paths that well in 0.4.2)
-   
-4. Inside ${dojo}/buildscripts run:
-   $ ant -Dversion=0.4.2 -Dprofile=struts clean release intern-strings
-   $ cp ../release/dojo/dojo.js ${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
-   $ cp ../release/dojo/dojo.js.uncompressed.js  ${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
-   $ cp ../release/dojo/nls ${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/profile/struts.profile.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/profile/struts.profile.js b/plugins/dojo/src/profile/struts.profile.js
deleted file mode 100644
index e587621..0000000
--- a/plugins/dojo/src/profile/struts.profile.js
+++ /dev/null
@@ -1,36 +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.
- */
-
-var dependencies = [
-	"dojo.io.*",
-	"dojo.io.BrowserIO",
-	"dojo.event.*",
-    "dojo.lfx.*",
-    "dojo.namespaces.*",
-    "dojo.widget.Editor2",
-    "struts.widget.*",
-];
-
-dependencies.prefixes = [
-   ["struts", "../struts/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts"]
-];
-
-load("getDependencyList.js");

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/site/site.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/site/site.xml b/plugins/dojo/src/site/site.xml
deleted file mode 100644
index 07a667e..0000000
--- a/plugins/dojo/src/site/site.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-/*
- * 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.
- */
--->
-<project name="Struts 2">
-    <skin>
-        <groupId>org.apache.maven.skins</groupId>
-        <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.1</version>
-    </skin>
-    <bannerLeft>
-        <name>Apache Software Foundation</name>
-        <src>http://www.apache.org/images/asf-logo.gif</src>
-        <href>http://www.apache.org/</href>
-    </bannerLeft>
-    <bannerRight>
-        <name>Apache Struts</name>
-        <src>http://struts.apache.org/img/struts-logo.svg</src>
-        <href>http://struts.apache.org/</href>
-    </bannerRight>
-    <publishDate position="none"/>
-    <version position="none"/>
-    <body>
-        <links>
-            <item name="Apache" href="http://www.apache.org/"/>
-            <item name="Struts" href="http://struts.apache.org/"/>
-        </links>
-
-        <menu ref="parent"/>
-        <menu ref="reports"/>
-
-        <footer>
-            <div class="row span12">
-                Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
-                project logos are trademarks of The Apache Software Foundation.
-            </div>
-        </footer>
-
-    </body>
-</project>

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
deleted file mode 100644
index 0122320..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
+++ /dev/null
@@ -1,142 +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.
- */
-
-package org.apache.struts2.dojo;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
-
-/**
- */
-public class TestAction extends ActionSupport {
-
-    private static final long serialVersionUID = -8891365561914451494L;
-
-    private Collection collection;
-    private Collection collection2;
-    private Map map;
-    private String foo;
-    private Integer fooInt;
-    private String result;
-    private String[] array;
-    private String[][] list;
-    private List list2;
-    private List list3;
-
-    public Collection getCollection() {
-        return collection;
-    }
-
-    public void setCollection(Collection collection) {
-        this.collection = collection;
-    }
-
-    public Map getMap() {
-        return map;
-    }
-
-    public void setMap(Map map) {
-        this.map = map;
-    }
-
-    public String getFoo() {
-        return foo;
-    }
-
-    public void setFoo(String foo) {
-        this.foo = foo;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public String[] getArray() {
-        return array;
-    }
-
-    public void setArray(String[] array) {
-        this.array = array;
-    }
-
-    public String[][] getList() {
-        return list;
-    }
-
-    public void setList(String[][] list) {
-        this.list = list;
-    }
-
-    public List getList2() {
-        return list2;
-    }
-
-    public void setList2(List list2) {
-        this.list2 = list2;
-    }
-
-    public void setList3(List list) {
-        this.list3 = list;
-    }
-
-    public List getList3() {
-        return this.list3;
-    }
-
-    public Collection getCollection2() {
-        return this.collection2;
-    }
-
-    public void setCollection2(Collection collection) {
-        this.collection2 = collection;
-    }
-
-    public Integer getFooInt() {
-        return fooInt;
-    }
-
-    public void setFooInt(Integer fooInt) {
-        this.fooInt = fooInt;
-    }
-
-    public String execute() throws Exception {
-        if (result == null) {
-            result = Action.SUCCESS;
-        }
-
-        return result;
-    }
-
-    public String doInput() throws Exception {
-        return INPUT;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
deleted file mode 100644
index a3bf453..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
+++ /dev/null
@@ -1,139 +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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.dispatcher.ApplicationMap;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.RequestMap;
-import org.apache.struts2.dispatcher.SessionMap;
-import org.apache.struts2.dojo.TestAction;
-import org.apache.struts2.dojo.components.Head;
-
-import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.ValueStack;
-
-
-/**
- * Base class to extend for unit testing UI Tags.
- *
- */
-public abstract class AbstractTagTest extends StrutsTestCase {
-    protected Action action;
-    protected Map<String, Object> context;
-    protected Map<String, Object> session;
-    protected ValueStack stack;
-
-    /**
-     * contains the buffer that our unit test will write to.  we can later verify this buffer for correctness.
-     */
-    protected StringWriter writer;
-    protected StrutsMockHttpServletRequest request;
-    protected StrutsMockPageContext pageContext;
-    protected HttpServletResponse response;
-    protected StrutsMockServletContext servletContext;
-    
-    protected Mock mockContainer;
-
-    /**
-     * Constructs the action that we're going to test against.  For most UI tests, this default action should be enough.
-     * However, simply override getAction to return a custom Action if you need something more sophisticated.
-     *
-     * @return the Action to be added to the ValueStack as part of the unit test
-     */
-    public Action getAction() {
-        return new TestAction();
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        /**
-         * create our standard mock objects
-         */
-        action = this.getAction();
-        stack = ActionContext.getContext().getValueStack();
-        context = stack.getContext();
-        stack.push(action);
-        context.put(Head.PARSE_CONTENT, false);
-
-        request = new StrutsMockHttpServletRequest();
-        request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
-        response = new StrutsMockHttpServletResponse();
-        request.setSession(new StrutsMockHttpSession());
-        request.setupGetServletPath("/");
-
-        writer = new StringWriter();
-
-        JspWriter jspWriter = new StrutsMockJspWriter(writer);
-
-        servletContext = new StrutsMockServletContext();
-        servletContext.setRealPath(new File("nosuchfile.properties").getAbsolutePath());
-        servletContext.setServletInfo("Resin");
-
-        pageContext = new StrutsMockPageContext();
-        pageContext.setRequest(request);
-        pageContext.setResponse(response);
-        pageContext.setJspWriter(jspWriter);
-        pageContext.setServletContext(servletContext);
-
-        mockContainer = new Mock(Container.class);
-        Dispatcher du = new Dispatcher(pageContext.getServletContext(), new HashMap<String, String>());
-        du.init();
-        Dispatcher.setInstance(du);
-        du.setConfigurationManager(configurationManager);
-        session = new SessionMap<String, Object>(request);
-        Map<String, Object> extraContext = du.createContextMap(new RequestMap(request),
-                request.getParameterMap(),
-                session,
-                new ApplicationMap(pageContext.getServletContext()),
-                request,
-                response);
-        // let's not set the locale -- there is a test that checks if Dispatcher actually picks this up...
-        // ... but generally we want to just use no locale (let it stay system default)
-        extraContext.remove(ActionContext.LOCALE);
-        stack.getContext().putAll(extraContext);
-
-        context.put(ServletActionContext.HTTP_REQUEST, request);
-        context.put(ServletActionContext.HTTP_RESPONSE, response);
-        context.put(ServletActionContext.SERVLET_CONTEXT, servletContext);
-
-        ActionContext.setContext(new ActionContext(context));
-    }
-
-    protected void tearDown() throws Exception {
-        pageContext.verify();
-        request.verify();
-    }
-}