Author: husted
Date: Fri Oct 20 04:18:03 2006
New Revision: 466065

URL: http://svn.apache.org/viewvc?view=rev&rev=466065
Log:
WW-1340 Update wildcard links in blank application to match tutorial.

Modified:
    struts/struts2/trunk/apps/blank/src/main/resources/example.xml
    struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
    struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java

Modified: struts/struts2/trunk/apps/blank/src/main/resources/example.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/example.xml?view=diff&rev=466065&r1=466064&r2=466065
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/resources/example.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/example.xml Fri Oct 20 
04:18:03 2006
@@ -10,7 +10,7 @@
             <result>/example/HelloWorld.jsp</result>
         </action>
 
-        <action name="Login!*" method="{1}" class="example.Login">
+        <action name="Login_*" method="{1}" class="example.Login">
             <result name="input">/example/Login.jsp</result>
             <result type="redirect-action">Menu</result>
         </action>

Modified: struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp?view=diff&rev=466065&r1=466064&r2=466065
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp 
(original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/example/Welcome.jsp Fri Oct 
20 04:18:03 2006
@@ -10,7 +10,7 @@
 <body>
 <h3>Commands</h3>
 <ul>
-    <li><a href="<s:url action="Login!input"/>">Sign On</a></li>
+    <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
     <li><a href="<s:url action="Register"/>">Register</a></li>
 </ul>
 

Modified: struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java?view=diff&rev=466065&r1=466064&r2=466065
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java 
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java Fri 
Oct 20 04:18:03 2006
@@ -10,7 +10,7 @@
 public class LoginTest extends ConfigTest {
 
     public void FIXME_testLoginConfig() throws Exception {
-        ActionConfig config = assertClass("example", "Login!input", 
"example.Login");
+        ActionConfig config = assertClass("example", "Login_input", 
"example.Login");
         assertResult(config, ActionSupport.SUCCESS, "Menu");
         assertResult(config, ActionSupport.INPUT, "/example/Login.jsp");
     }


Reply via email to