struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r750605 - in /struts/sandbox/trunk/s2-jquery-showcase: ./ src/main/java/org/apache/struts2/jquery/actions/form/ src/main/resources/ src/main/webapp/WEB-INF/content/ src/main/webapp/WEB-INF/content/form/ src/test/resources/selenium/
Date Thu, 05 Mar 2009 21:42:11 GMT
Author: wesw
Date: Thu Mar  5 21:42:10 2009
New Revision: 750605

URL: http://svn.apache.org/viewvc?rev=750605&view=rev
Log:
further conventionalizing, added another selenium test

Added:
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetGetReqAjaxResp-input.jsp
      - copied, changed from r750456, struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResp-input.jsp
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetGetReqAjaxResp.jsp
      - copied unchanged from r750456, struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResponse.jsp
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp-input.jsp
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp.jsp
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetPostReqAjaxResp
Removed:
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResp-input.jsp
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResponse.jsp
Modified:
    struts/sandbox/trunk/s2-jquery-showcase/pom.xml
    struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
    struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/struts.xml
    struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetGetReqAjaxResp
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetAjaxResponse
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetNonAjaxResponse
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostAjaxResponse
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostNonAjaxResponse
    struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/s2-jquery-plugin-selenium-tests

Modified: struts/sandbox/trunk/s2-jquery-showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/pom.xml?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/pom.xml (original)
+++ struts/sandbox/trunk/s2-jquery-showcase/pom.xml Thu Mar  5 21:42:10 2009
@@ -65,6 +65,14 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.14</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
Thu Mar  5 21:42:10 2009
@@ -15,12 +15,12 @@
     private String msg;
 
     @Actions({
-            @Action("SimpleFormWithResetGetAjaxResponse"),
-            @Action("SimpleFormGetAjaxResponse"),
             @Action("SimpleFormGetAjaxResponse"),
             @Action("SimpleFormPostAjaxResponse"),
             @Action("SimpleFormGetNonAjaxResponse"),
-            @Action("SimpleFormPostNonAjaxResponse")
+            @Action("SimpleFormPostNonAjaxResponse"),
+            @Action("FormWithResetGetReqAjaxResp"),
+            @Action("FormWithResetPostReqAjaxResp")
     })
     public String execute() {
         return ActionSupport.SUCCESS;

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/struts.xml?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/struts.xml (original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/struts.xml Thu Mar  5 21:42:10
2009
@@ -8,9 +8,5 @@
             <result>/WEB-INF/content/index.jsp</result>
         </action>
 
-        <action name="FormWithResetGetReqAjaxResp_*" method="{1}" class="org.apache.struts2.jquery.actions.MessageAction">
-            <result name="input">/WEB-INF/content/form/SimpleFormWithResetGetAjaxResp-input.jsp</result>
-            <result>/WEB-INF/content/form/SimpleFormWithResetGetAjaxResponse.jsp</result>
-        </action>
     </package>
 </struts>
\ No newline at end of file

Copied: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetGetReqAjaxResp-input.jsp
(from r750456, struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResp-input.jsp)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetGetReqAjaxResp-input.jsp?p2=struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetGetReqAjaxResp-input.jsp&p1=struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResp-input.jsp&r1=750456&r2=750605&rev=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/SimpleFormWithResetGetAjaxResp-input.jsp
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetGetReqAjaxResp-input.jsp
Thu Mar  5 21:42:10 2009
@@ -13,7 +13,7 @@
 <body>
 <sjx:form id="indexForm" method="get" validate="true"
           namespace="/form"
-          action="SimpleFormPostAjaxResponse"
+          action="FormWithResetGetReqAjaxResp"
           ajaxResult="true" ajaxResultHandler="handleAjaxResponse" >
 <sjx:textfield key="msg" />
 <sjx:submit />

Added: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp-input.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp-input.jsp?rev=750605&view=auto
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp-input.jsp
(added)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp-input.jsp
Thu Mar  5 21:42:10 2009
@@ -0,0 +1,24 @@
+<%@ taglib prefix="sjx" uri="/struts-jquery-tags" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Hello World!</title>
+<sjx:head />
+    <script type="text/javascript">
+        function handleAjaxResponse(data, textStatus) {
+            $("#messages").append(data + "<br />\n");
+        }
+    </script>
+</head>
+<body>
+<sjx:form id="indexForm" method="post" validate="true"
+          namespace="/form"
+          action="FormWithResetPostReqAjaxResp"
+          ajaxResult="true" ajaxResultHandler="handleAjaxResponse" >
+<sjx:textfield key="msg" />
+<sjx:submit />
+<sjx:reset />
+</sjx:form>
+<div id="messages"></div>
+</body>
+</html>

Added: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp.jsp?rev=750605&view=auto
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp.jsp
(added)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp.jsp
Thu Mar  5 21:42:10 2009
@@ -0,0 +1,2 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+your message - <s:property value="msg"/>
\ No newline at end of file

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp (original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp Thu
Mar  5 21:42:10 2009
@@ -22,6 +22,15 @@
            <s:url var="url" namespace="/form" action="SimpleFormGetAjaxResponse-input"/>
            <s:a href="%{#url}">Simple Form Get Ajax</s:a>
        </li>
+       <li>
+           <s:url var="url" namespace="/form" action="FormWithResetGetReqAjaxResp-input"/>
+           <s:a href="%{#url}">Form With Reset Get Ajax Response</s:a>
+       </li>
+       <li>
+           <s:url var="url" namespace="/form" action="FormWithResetPostReqAjaxResp-input"/>
+           <s:a href="%{#url}">Form With Reset Post Ajax Response</s:a>
+       </li>
+
    </ul>
 </body>
 </html>
\ No newline at end of file

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetGetReqAjaxResp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetGetReqAjaxResp?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetGetReqAjaxResp
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetGetReqAjaxResp
Thu Mar  5 21:42:10 2009
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/FormWithResetGetReqAjaxResp_input.action"
/>
+<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/form/FormWithResetGetReqAjaxResp-input"
/>
 <title>FormWithResetGetReqAjaxResp</title>
 </head>
 <body>
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/s2-jquery-showcase/FormWithResetGetReqAjaxResp_input.action</td>
+	<td>/s2-jquery-showcase/form/FormWithResetGetReqAjaxResp-input</td>
 	<td></td>
 </tr>
 <tr>

Added: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetPostReqAjaxResp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetPostReqAjaxResp?rev=750605&view=auto
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetPostReqAjaxResp
(added)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/FormWithResetPostReqAjaxResp
Thu Mar  5 21:42:10 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SimpleFormPostNonAjaxResponse">SimpleFormPostNonAjaxResponse</a></td></tr>
+<tr><td><a href="SimpleFormGetNonAjaxResponse">SimpleFormGetNonAjaxResponse</a></td></tr>
+<tr><td><a href="SimpleFormPostAjaxResponse">SimpleFormPostAjaxResponse</a></td></tr>
+<tr><td><a href="SimpleFormGetAjaxResponse">SimpleFormGetAjaxResponse</a></td></tr>
+<tr><td><a href="FormWithResetGetReqAjaxResp">FormWithResetGetReqAjaxResp</a></td></tr>
+<tr><td><a href="../../../../../../idea-src/s2-jquery-showcase/src/test/resources/selenium/FormWithResetPostReqAjaxResp">FormWithResetPostReqAjaxResp</a></td></tr>
+</tbody></table>
+</body>
+</html>

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetAjaxResponse
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetAjaxResponse?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetAjaxResponse
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetAjaxResponse
Thu Mar  5 21:42:10 2009
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/SimpleFormGetAjaxResponse_input.action"
/>
+<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/form/SimpleFormGetAjaxResponse-input"
/>
 <title>SimpleFormGetAjaxResponse</title>
 </head>
 <body>
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/s2-jquery-showcase/SimpleFormGetAjaxResponse_input.action</td>
+	<td>/s2-jquery-showcase/form/SimpleFormGetAjaxResponse-input</td>
 	<td></td>
 </tr>
 <tr>

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetNonAjaxResponse
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetNonAjaxResponse?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetNonAjaxResponse
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormGetNonAjaxResponse
Thu Mar  5 21:42:10 2009
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/SimpleFormGetNonAjaxResponse_input.action"
/>
+<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/SimpleFormGetNonAjaxResponse-input"
/>
 <title>SimpleFormGetNonAjaxResponse</title>
 </head>
 <body>
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/s2-jquery-showcase/SimpleFormGetNonAjaxResponse_input.action</td>
+	<td>/s2-jquery-showcase/form/SimpleFormGetNonAjaxResponse-input</td>
 	<td></td>
 </tr>
 <tr>

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostAjaxResponse
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostAjaxResponse?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostAjaxResponse
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostAjaxResponse
Thu Mar  5 21:42:10 2009
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/SimpleFormPostAjaxResponse_input.action"
/>
+<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/form/SimpleFormPostAjaxResponse-input"
/>
 <title>SimpleFormPostAjaxResponse</title>
 </head>
 <body>
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/s2-jquery-showcase/SimpleFormPostAjaxResponse_input.action</td>
+	<td>/s2-jquery-showcase/form/SimpleFormPostAjaxResponse-input</td>
 	<td></td>
 </tr>
 <tr>

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostNonAjaxResponse
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostNonAjaxResponse?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostNonAjaxResponse
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/SimpleFormPostNonAjaxResponse
Thu Mar  5 21:42:10 2009
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/SimpleFormPostNonAjaxResponse_input.action"
/>
+<link rel="selenium.base" href="http://localhost:8080/s2-jquery-showcase/form/SimpleFormPostNonAjaxResponse-input"
/>
 <title>SimpleFormPostNonAjaxResponse</title>
 </head>
 <body>
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/s2-jquery-showcase/SimpleFormPostNonAjaxResponse_input.action</td>
+	<td>/s2-jquery-showcase/form/SimpleFormPostNonAjaxResponse-input</td>
 	<td></td>
 </tr>
 <tr>

Modified: struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/s2-jquery-plugin-selenium-tests
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/s2-jquery-plugin-selenium-tests?rev=750605&r1=750604&r2=750605&view=diff
==============================================================================
--- struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/s2-jquery-plugin-selenium-tests
(original)
+++ struts/sandbox/trunk/s2-jquery-showcase/src/test/resources/selenium/s2-jquery-plugin-selenium-tests
Thu Mar  5 21:42:10 2009
@@ -13,6 +13,7 @@
 <tr><td><a href="SimpleFormPostAjaxResponse">SimpleFormPostAjaxResponse</a></td></tr>
 <tr><td><a href="SimpleFormGetAjaxResponse">SimpleFormGetAjaxResponse</a></td></tr>
 <tr><td><a href="FormWithResetGetReqAjaxResp">FormWithResetGetReqAjaxResp</a></td></tr>
+<tr><td><a href="FormWithResetPostReqAjaxResp">FormWithResetPostReqAjaxResp</a></td></tr>
 </tbody></table>
 </body>
 </html>



Mime
View raw message