Move classes to "dojo" package so they don't conflict with the ones from core

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@514940 13f79535-47bb-0310-9956-ffa450edef68
2026-08-07 07:37:20 +00:00 · 2007-03-06 01:11:06 +00:00
parent de09c2ca53
commit 65131d66a5
66 changed files with 16987 additions and 10906 deletions
@@ -15,11 +15,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;

@@ -88,6 +89,11 @@ public abstract class AbstractRemoteCallUIBean extends ClosingUIBean implements
    }


+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+
    @StrutsTagAttribute(description="Topic that will trigger the remote call")
    public void setListenTopics(String listenTopics) {
        this.listenTopics = listenTopics;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -80,7 +80,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </pre>
 *
 */
-@StrutsTag(name="a", tldTagClass="org.apache.struts2.views.jsp.ui.AnchorTag", description="Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets")
+@StrutsTag(name="a", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.AnchorTag", description="Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets")
 public class Anchor extends AbstractRemoteCallUIBean {
    public static final String OPEN_TEMPLATE = "a";
    public static final String TEMPLATE = "a-close";
@@ -18,11 +18,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.components.ComboBox;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -45,7 +46,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 *<br/>
 *<!-- END SNIPPET: example -->
 */
-@StrutsTag(name="autocompleter", tldTagClass="org.apache.struts2.views.jsp.ui.AutocompleterTag", description="Renders a combobox with autocomplete and AJAX capabilities")
+@StrutsTag(name="autocompleter", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.AutocompleterTag", description="Renders a combobox with autocomplete and AJAX capabilities")
@StrutsTagSkipInheritance
 public class Autocompleter extends ComboBox {
    public static final String TEMPLATE = "autocompleter";
@@ -146,6 +147,11 @@ public class Autocompleter extends ComboBox {
        addParameter("key", findString(keyNameExpr));
    }

+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
    protected Object findListValue() {
        return (list != null) ? findValue(list, Object.class) : null;
    }
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.components.UIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -126,7 +127,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </pre>
 *
 */
-@StrutsTag(name="datetimepicker", tldTagClass="org.apache.struts2.views.jsp.ui.DateTimePickerTag", description="Render datetimepicker")
+@StrutsTag(name="datetimepicker", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.DateTimePickerTag", description="Render datetimepicker")
@StrutsTagSkipInheritance
 public class DateTimePicker extends UIBean {

@@ -213,6 +214,11 @@ public class DateTimePicker extends UIBean {
        }
    }

+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
    @StrutsTagAttribute(description="If true, weekly size of calendar changes to acomodate the month if false," +
                " 42 day format is used", type="Boolean", defaultValue="false")
    public void setAdjustWeeks(String adjustWeeks) {
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -58,7 +58,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </p>
 *
 */
-@StrutsTag(name="div", tldTagClass="org.apache.struts2.views.jsp.ui.DivTag", description="Render HTML div providing content from remote call via AJAX")
+@StrutsTag(name="div", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.DivTag", description="Render HTML div providing content from remote call via AJAX")
 public class Div extends AbstractRemoteCallUIBean {

    public static final String TEMPLATE = "div";
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;


 public interface RemoteUICallBean {
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import java.io.Writer;

@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.components.FormButton;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -91,7 +92,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </pre>
 *
 */
-@StrutsTag(name="submit", tldTagClass="org.apache.struts2.views.jsp.ui.SubmitTag", description="Render a submit button")
+@StrutsTag(name="submit", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.SubmitTag", description="Render a submit button")
@StrutsTagSkipInheritance
 public class Submit extends FormButton implements RemoteUICallBean {
    
@@ -175,6 +176,11 @@ public class Submit extends FormButton implements RemoteUICallBean {
            addParameter("showLoadingText", findString(showLoadingText));
    }

+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
    /**
     * Indicate whether the concrete button supports the type "image".
     *
@@ -18,11 +18,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -58,7 +59,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </pre>
 *
 */
-@StrutsTag(name="tabbedPanel", tldTagClass="org.apache.struts2.views.jsp.ui.TabbedPanelTag", description="Render a tabbedPanel widget.")
+@StrutsTag(name="tabbedPanel", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TabbedPanelTag", description="Render a tabbedPanel widget.")
@StrutsTagSkipInheritance
 public class TabbedPanel extends ClosingUIBean {
    public static final String TEMPLATE = "tabbedpanel";
@@ -96,6 +97,11 @@ public class TabbedPanel extends ClosingUIBean {
            addParameter("templateCssPath", findString(templateCssPath));
    }

+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
    public String getDefaultOpenTemplate() {
        return TEMPLATE;
    }
@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import java.io.Writer;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -68,7 +69,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </pre>
 *
 */
-@StrutsTag(name="tree", tldTagClass="org.apache.struts2.views.jsp.ui.TreeTag", description="Render a tree widget.")
+@StrutsTag(name="tree", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TreeTag", description="Render a tree widget.")
@StrutsTagSkipInheritance
 public class Tree extends ClosingUIBean {

@@ -18,11 +18,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -80,7 +81,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * </pre>
 *
 */
-@StrutsTag(name="treenode", tldTagClass="org.apache.struts2.views.jsp.ui.TreeNodeTag", description="Render a tree node within a tree widget.")
+@StrutsTag(name="treenode", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TreeNodeTag", description="Render a tree node within a tree widget.")
@StrutsTagSkipInheritance
 public class TreeNode extends ClosingUIBean {
    private static final String TEMPLATE = "treenode-close";
@@ -1,4 +1,4 @@
-package org.apache.struts2.views;
+package org.apache.struts2.dojo.views;

 import java.util.Arrays;
 import java.util.List;
@@ -6,15 +6,16 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.dojo.views.velocity.components.AnchorDirective;
+import org.apache.struts2.dojo.views.velocity.components.AutocompleterDirective;
+import org.apache.struts2.dojo.views.velocity.components.DateTimePickerDirective;
+import org.apache.struts2.dojo.views.velocity.components.DivDirective;
+import org.apache.struts2.dojo.views.velocity.components.SubmitDirective;
+import org.apache.struts2.dojo.views.velocity.components.TabbedPanelDirective;
+import org.apache.struts2.dojo.views.velocity.components.TreeDirective;
+import org.apache.struts2.dojo.views.velocity.components.TreeNodeDirective;
+import org.apache.struts2.views.TagLibrary;
 import org.apache.struts2.views.freemarker.tags.StrutsModels;
-import org.apache.struts2.views.velocity.components.AnchorDirective;
-import org.apache.struts2.views.velocity.components.AutocompleterDirective;
-import org.apache.struts2.views.velocity.components.DateTimePickerDirective;
-import org.apache.struts2.views.velocity.components.DivDirective;
-import org.apache.struts2.views.velocity.components.SubmitDirective;
-import org.apache.struts2.views.velocity.components.TabbedPanelDirective;
-import org.apache.struts2.views.velocity.components.TreeDirective;
-import org.apache.struts2.views.velocity.components.TreeNodeDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Autocompleter;
+import org.apache.struts2.dojo.components.Autocompleter;
+import org.apache.struts2.views.freemarker.tags.TagModel;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -15,13 +15,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DateTimePicker;
+import org.apache.struts2.dojo.components.DateTimePicker;
+import org.apache.struts2.views.freemarker.tags.TextFieldModel;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -1,8 +1,12 @@
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import org.apache.struts2.views.freemarker.tags.AnchorModel;
+import org.apache.struts2.views.freemarker.tags.DivModel;
+import org.apache.struts2.views.freemarker.tags.SubmitModel;
+
 import com.opensymphony.xwork2.util.ValueStack;

 public class DojoModels {
@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TabbedPanel;
+import org.apache.struts2.dojo.components.TabbedPanel;
+import org.apache.struts2.views.freemarker.tags.TagModel;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Tree;
+import org.apache.struts2.dojo.components.Tree;
+import org.apache.struts2.views.freemarker.tags.TagModel;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TreeNode;
+import org.apache.struts2.dojo.components.TreeNode;
+import org.apache.struts2.views.freemarker.tags.TagModel;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -15,9 +15,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

-import org.apache.struts2.components.RemoteUICallBean;
+import org.apache.struts2.dojo.components.RemoteUICallBean;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;

 public abstract class AbstractRemoteCallUITag extends AbstractClosingTag {

@@ -18,13 +18,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import org.apache.struts2.components.Anchor;
 import org.apache.struts2.components.Component;
+import org.apache.struts2.dojo.components.Anchor;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -33,7 +33,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 */
 public class AnchorTag extends AbstractRemoteCallUITag {

-	private static final long serialVersionUID = -1034616578492431113L;
+    private static final long serialVersionUID = -1034616578492431113L;

    protected String targets;
    protected String preInvokeJS;
@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import org.apache.struts2.components.Autocompleter;
 import org.apache.struts2.components.Component;
+import org.apache.struts2.dojo.components.Autocompleter;
+import org.apache.struts2.views.jsp.ui.ComboBoxTag;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DateTimePicker;
+import org.apache.struts2.dojo.components.DateTimePicker;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
+import org.apache.struts2.dojo.components.Div;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Submit;
+import org.apache.struts2.dojo.components.Submit;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TabbedPanel;
+import org.apache.struts2.dojo.components.TabbedPanel;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TreeNode;
+import org.apache.struts2.dojo.components.TreeNode;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Tree;
+import org.apache.struts2.dojo.components.Tree;
+import org.apache.struts2.views.jsp.ui.AbstractClosingTag;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -0,0 +1,47 @@
+/*
+ * $Id: AnchorDirective.java 471756 2006-11-06 15:01:43Z husted $
+ *
+ * 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.velocity.components;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Anchor;
+import org.apache.struts2.components.Component;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * @see Anchor
+ */
+public class AnchorDirective extends AbstractDirective {
+    public String getBeanName() {
+        return "a";
+    }
+
+    protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+        return new Anchor(stack, req, res);
+    }
+
+    public int getType() {
+        return BLOCK;
+    }
+}
@@ -18,14 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import org.apache.struts2.components.Autocompleter;
-import org.apache.struts2.components.Bean;
 import org.apache.struts2.components.Component;
+import org.apache.struts2.dojo.components.Autocompleter;
+import org.apache.struts2.views.velocity.components.AbstractDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -15,13 +15,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.DateTimePicker;
+import org.apache.struts2.dojo.components.DateTimePicker;
+import org.apache.struts2.views.velocity.components.TextFieldDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
+import org.apache.struts2.dojo.components.Div;
+import org.apache.struts2.views.velocity.components.AbstractDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -0,0 +1,43 @@
+/*
+ * $Id: SubmitDirective.java 471756 2006-11-06 15:01:43Z husted $
+ *
+ * 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.velocity.components;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Component;
+import org.apache.struts2.components.Submit;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * @see Submit
+ */
+public class SubmitDirective extends AbstractDirective {
+    public String getBeanName() {
+        return "submit";
+    }
+
+    protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
+        return new Submit(stack, req, res);
+    }
+}
@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TabbedPanel;
+import org.apache.struts2.dojo.components.TabbedPanel;
+import org.apache.struts2.views.velocity.components.AbstractDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Tree;
+import org.apache.struts2.dojo.components.Tree;
+import org.apache.struts2.views.velocity.components.AbstractDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -18,13 +18,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.struts2.components.Component;
-import org.apache.struts2.components.TreeNode;
+import org.apache.struts2.dojo.components.TreeNode;
+import org.apache.struts2.views.velocity.components.AbstractDirective;

 import com.opensymphony.xwork2.util.ValueStack;

@@ -1,4 +1,3 @@
 <a dojoType="struts:BindAnchor"
  <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
-  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 >
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2;
+package org.apache.struts2.dojo;

 import java.util.Collection;
 import java.util.List;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.io.File;
 import java.io.StringWriter;
@@ -30,11 +30,11 @@ import javax.servlet.jsp.JspWriter;

 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.TestAction;
 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 com.mockobjects.dynamic.Mock;
 import com.opensymphony.xwork2.Action;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.beans.IntrospectionException;
 import java.beans.Introspector;
@@ -41,7 +41,6 @@ import org.apache.struts2.views.jsp.ui.AbstractUITag;

 import com.opensymphony.xwork2.ActionContext;

-
 /**
 */
 public abstract class AbstractUITagTest extends AbstractTagTest {
@@ -18,11 +18,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.ui.dojo.AnchorTag;
+package org.apache.struts2.dojo.views.jsp.ui;

+import org.apache.struts2.dojo.TestAction;

 /**
 */
@@ -37,7 +35,6 @@ public class AnchorTest extends AbstractUITagTest {
        tag.setPageContext(pageContext);

        tag.setId("mylink");
-        tag.setTheme("ajax");
        tag.setHref("a");
        tag.setErrorText("c");
        tag.setLoadingText("d");
@@ -18,10 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.views.jsp.ui.dojo.AutocompleterTag;
-
+package org.apache.struts2.dojo.views.jsp.ui;

 /**
 * @see org.apache.struts2.components.Autocompleter
@@ -31,7 +28,6 @@ public class AutocompleterTest extends AbstractUITagTest {
    public void testAjax() throws Exception {
        AutocompleterTag tag = new AutocompleterTag();
        tag.setPageContext(pageContext);
-        tag.setTheme("ajax");
        tag.setAutoComplete("true");
        tag.setDisabled("false");
        tag.setForceValidOption("false");
@@ -60,7 +56,6 @@ public class AutocompleterTest extends AbstractUITagTest {
    public void testSimple() throws Exception {
        AutocompleterTag tag = new AutocompleterTag();
        tag.setPageContext(pageContext);
-        tag.setTheme("simple");
        tag.setAutoComplete("true");
        tag.setDisabled("false");
        tag.setForceValidOption("false");
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,40 +18,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.views.jsp.ui.dojo.AbstractRemoteCallUITag;
-import org.apache.struts2.views.jsp.ui.dojo.DateTimePickerTag;
-import org.apache.struts2.views.jsp.ui.dojo.DivTag;
-
-
+package org.apache.struts2.dojo.views.jsp.ui;

 /**
 */
 public class DateTimePickerTagTest extends AbstractUITagTest {
-
-
-    public void testGenericSimple() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericAjax() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
-    }
-
    public void testSimple() throws Exception {
        DateTimePickerTag tag = new DateTimePickerTag();
        tag.setPageContext(pageContext);

        tag.setId("id");
-        tag.setTheme("ajax");

        tag.setAdjustWeeks("true");
        tag.setDayWidth("b");
@@ -18,33 +18,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.ui.dojo.AbstractRemoteCallUITag;
-import org.apache.struts2.views.jsp.ui.dojo.DivTag;
+import org.apache.struts2.dojo.TestAction;


 /**
 */
 public class DivTest extends AbstractUITagTest {

-
-    public void testGenericSimple() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericAjax() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
-    }
-
    public void testSimple() throws Exception {
        TestAction testAction = (TestAction) action;
        testAction.setFoo("bar");
@@ -53,7 +35,6 @@ public class DivTest extends AbstractUITagTest {
        tag.setPageContext(pageContext);

        tag.setId("mylabel");
-        tag.setTheme("ajax");
        tag.setHref("a");
        tag.setLoadingText("b");
        tag.setErrorText("c");
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.util.Collections;
 import java.util.Enumeration;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.io.IOException;
 import java.io.StringWriter;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -15,33 +15,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;

-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.ui.dojo.AbstractRemoteCallUITag;
-import org.apache.struts2.views.jsp.ui.dojo.DivTag;
-import org.apache.struts2.views.jsp.ui.dojo.SubmitTag;
+import org.apache.struts2.dojo.TestAction;

 /**
 * Test Submit component in "ajax" theme.
 */
 public class SubmitAjaxTest extends AbstractUITagTest {
-
-    public void testGenericSimple() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericAjax() throws Exception {
-        AbstractRemoteCallUITag tag = new DivTag();
-        verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
-    }
-
    public void testSubmit() throws Exception {
        TestAction testAction = (TestAction) action;
        testAction.setFoo("bar");
@@ -50,7 +31,6 @@ public class SubmitAjaxTest extends AbstractUITagTest {
        tag.setPageContext(pageContext);

        tag.setId("a");
-        tag.setTheme("ajax");
        tag.setHref("b");
        tag.setLoadingText("c");
        tag.setErrorText("d");
@@ -18,12 +18,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;


-import org.apache.struts2.views.jsp.ui.dojo.TreeNodeTag;
-import org.apache.struts2.views.jsp.ui.dojo.TreeTag;
-
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionSupport;

@@ -38,7 +35,6 @@ public class TreeTest extends AbstractUITagTest{
        tag.setShowRootGrid("false");
        tag.setShowGrid("false");
        tag.setTemplateCssPath("/struts/tree.css");
-        tag.setTheme("ajax");
        tag.setPageContext(pageContext);
        tag.setId("rootId");
        tag.setLabel("Root");