You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/03/06 02:11:09 UTC
svn commit: r514940 [3/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...
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/a.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/a.ftl?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/a.ftl (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/a.ftl Mon Mar 5 17:11:06 2007
@@ -1,4 +1,3 @@
<a dojoType="struts:BindAnchor"
<#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
- <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
Copied: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java (from r514161, struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java?view=diff&rev=514940&p1=struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java&r1=514161&p2=struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/TestAction.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.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;
+package org.apache.struts2.dojo;
import java.util.Collection;
import java.util.List;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.io.File;
import java.io.StringWriter;
@@ -30,11 +30,11 @@
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;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -40,7 +40,6 @@
import org.apache.struts2.views.jsp.ui.AbstractUITag;
import com.opensymphony.xwork2.ActionContext;
-
/**
*/
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java Mon Mar 5 17:11:06 2007
@@ -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 @@
tag.setPageContext(pageContext);
tag.setId("mylink");
- tag.setTheme("ajax");
tag.setHref("a");
tag.setErrorText("c");
tag.setLoadingText("d");
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java Mon Mar 5 17:11:06 2007
@@ -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 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 void testSimple() throws Exception {
AutocompleterTag tag = new AutocompleterTag();
tag.setPageContext(pageContext);
- tag.setTheme("simple");
tag.setAutoComplete("true");
tag.setDisabled("false");
tag.setForceValidOption("false");
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java Mon Mar 5 17:11:06 2007
@@ -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");
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java Mon Mar 5 17:11:06 2007
@@ -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 @@
tag.setPageContext(pageContext);
tag.setId("mylabel");
- tag.setTheme("ajax");
tag.setHref("a");
tag.setLoadingText("b");
tag.setErrorText("c");
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.util.Collections;
import java.util.Enumeration;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.util.Enumeration;
import java.util.Hashtable;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.io.IOException;
import java.io.StringWriter;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.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.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import java.io.InputStream;
import java.net.MalformedURLException;
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java Mon Mar 5 17:11:06 2007
@@ -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 @@
tag.setPageContext(pageContext);
tag.setId("a");
- tag.setTheme("ajax");
tag.setHref("b");
tag.setLoadingText("c");
tag.setErrorText("d");
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java?view=diff&rev=514940&r1=514939&r2=514940
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java Mon Mar 5 17:11:06 2007
@@ -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 @@
tag.setShowRootGrid("false");
tag.setShowGrid("false");
tag.setTemplateCssPath("/struts/tree.css");
- tag.setTheme("ajax");
tag.setPageContext(pageContext);
tag.setId("rootId");
tag.setLabel("Root");