struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r514940 [1/3] - in /struts/struts2/trunk/plugins/dojo/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/dojo/ main/java/org/apache/struts2/dojo/components/ main/java/org/apache/struts2/dojo/views/ main/java/org/apac...
Date Tue, 06 Mar 2007 01:11:09 GMT
Author: musachy
Date: Mon Mar  5 17:11:06 2007
New Revision: 514940

URL: http://svn.apache.org/viewvc?view=rev&rev=514940
Log:
Move classes to "dojo" package so they don't conflict with the ones from core 

Added:
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/
      - copied from r514161, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Div.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/
      - copied from r514161, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
      - copied, changed from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/
      - copied from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/freemarker/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/
      - copied from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/jsp/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/
      - copied from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/velocity/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java
      - copied, changed from r514161, struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/
      - copied from r514161, struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/views/
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/
      - copied from r514939, struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/views/jsp/
    struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/
    struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/
      - copied from r514161, struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/views/
    struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/
      - copied from r514939, struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/views/jsp/
Removed:
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/views/
    struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/views/
Modified:
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java
    struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js
    struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/a.ftl
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
    struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteCallUIBean.java Mon Mar  5 17:11:06 2007
@@ -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;
 
@@ -87,6 +88,11 @@
             addParameter("showLoadingText", findString(showLoadingText));
     }
 
+
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
 
     @StrutsTagAttribute(description="Topic that will trigger the remote call")
     public void setListenTopics(String listenTopics) {

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Anchor.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  * </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";

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Autocompleter.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  *<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 @@
         addParameter("key", findString(keyNameExpr));
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     protected Object findListValue() {
         return (list != null) ? findValue(list, Object.class) : null;
     }

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/DateTimePicker.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java Mon Mar  5 17:11:06 2007
@@ -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 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 @@
  * </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 @@
         }
     }
 
+    @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) {

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Div.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Div.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Div.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  * </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";

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/RemoteUICallBean.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteUICallBean.java Mon Mar  5 17:11:06 2007
@@ -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 {

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Submit.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java Mon Mar  5 17:11:06 2007
@@ -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 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 @@
  * </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 @@
             addParameter("showLoadingText", findString(showLoadingText));
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     /**
      * Indicate whether the concrete button supports the type "image".
      *

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TabbedPanel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  * </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 @@
             addParameter("templateCssPath", findString(templateCssPath));
     }
 
+    @Override
+    public String getTheme() {
+        return "ajax";
+    }
+    
     public String getDefaultOpenTemplate() {
         return TEMPLATE;
     }

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/Tree.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  * </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 {
 

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/components/TreeNode.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  * </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";

Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java (from r514939, struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java&r1=514939&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/views/DojoTagLibrary.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java Mon Mar  5 17:11:06 2007
@@ -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 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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java Mon Mar  5 17:11:06 2007
@@ -1,7 +1,11 @@
-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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteCallUITag.java Mon Mar  5 17:11:06 2007
@@ -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 {
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java Mon Mar  5 17:11:06 2007
@@ -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 @@
  */
 public class AnchorTag extends AbstractRemoteCallUITag {
 
-	private static final long serialVersionUID = -1034616578492431113L;
+    private static final long serialVersionUID = -1034616578492431113L;
 
     protected String targets;
     protected String preInvokeJS;

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Added: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java?view=auto&rev=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java (added)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
+    }
+}

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Added: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java?view=auto&rev=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java (added)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java Mon Mar  5 17:11:06 2007
@@ -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);
+    }
+}

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
 

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java Mon Mar  5 17:11:06 2007
@@ -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;
 



Mime
View raw message