You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/04/05 23:17:57 UTC

svn commit: r391814 - in /struts/sandbox/trunk/mailreader-course/action2: lab-1-0-src/src/java/ lab-1-0-src/src/webapp/WEB-INF/ lab-1-0-src/src/webapp/pages/ lab-1-1-src/src/java/ lab-1-1-src/src/test/ lab-1-1-src/src/webapp/WEB-INF/ lab-1-1-src/src/we...

Author: husted
Date: Wed Apr  5 14:17:54 2006
New Revision: 391814

URL: http://svn.apache.org/viewcvs?rev=391814&view=rev
Log:
mailreader-course/action2 
* Change "Home" to "Hello"
* Move Spring configuration file to classpath

Added:
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/pages/Hello.jsp
      - copied unchanged from r391796, struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/pages/Home.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Hello.java
      - copied, changed from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Home.java
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/applicationContext.xml
      - copied unchanged from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/applicationContext.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HelloTest.java
      - copied, changed from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HomeTest.java
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Hello.jsp
      - copied, changed from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Home.jsp
Removed:
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/pages/Home.jsp
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Home.java
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HomeTest.java
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/applicationContext.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Home.jsp
Modified:
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/Hello.java
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/xwork.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/WEB-INF/web.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/resources.properties
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/xwork.xml
    struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/web.xml

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/Hello.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/Hello.java?rev=391814&r1=391813&r2=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/Hello.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/Hello.java Wed Apr  5 14:17:54 2006
@@ -1,7 +1,7 @@
 import com.opensymphony.xwork.ActionSupport;
 
 /**
- * <code>Example Action class</code>
+ * Example Action class
  */
 public class Hello extends ActionSupport {
 

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/xwork.xml?rev=391814&r1=391813&r2=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/java/xwork.xml Wed Apr  5 14:17:54 2006
@@ -5,10 +5,10 @@
 
     <package name="default" extends="webwork-default">
 
-        <default-action-ref name="Home"/>
+        <default-action-ref name="Hello"/>
 
-        <action name="Home" class="Home">
-            <result>/pages/Home.jsp</result>
+        <action name="Hello" class="Hello">
+            <result>/pages/Hello.jsp</result>
         </action>
 
         <!-- Add your actions here -->

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/WEB-INF/web.xml?rev=391814&r1=391813&r2=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-0-src/src/webapp/WEB-INF/web.xml Wed Apr  5 14:17:54 2006
@@ -4,6 +4,11 @@
 
     <display-name>WebWork Application</display-name>
 
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath*:applicationContext*.xml</param-value>
+    </context-param>
+
     <filter>
         <filter-name>webwork</filter-name>
         <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>

Copied: struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Hello.java (from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Home.java)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Hello.java?p2=struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Hello.java&p1=struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Home.java&r1=391792&r2=391814&rev=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Home.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/Hello.java Wed Apr  5 14:17:54 2006
@@ -1,12 +1,12 @@
 import com.opensymphony.xwork.ActionSupport;
 
 /**
- * <code>Example Action class</code>
+ * Example Action class.
  */
-public class Home extends ActionSupport {
+public class Hello extends ActionSupport {
 
     /**
-     * An example implementation that does nothing an returns "success".
+     * An example implementation that does nothing and returns "success".
      *
      * @return {@link #SUCCESS}
      */

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/resources.properties
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/resources.properties?rev=391814&r1=391813&r2=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/resources.properties (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/resources.properties Wed Apr  5 14:17:54 2006
@@ -1,2 +1,2 @@
-home.nessage = Congratulations! WebWork is up and running ...
+hello.nessage = Congratulations! WebWork is up and running ...
 # Add your messages here ...

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/xwork.xml?rev=391814&r1=391813&r2=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/java/xwork.xml Wed Apr  5 14:17:54 2006
@@ -7,8 +7,8 @@
 
         <default-action-ref name="Missing"/>
 
-        <action name="Home" class="Home">
-            <result>/pages/Home.jsp</result>
+        <action name="Hello" class="Hello">
+            <result>/pages/Hello.jsp</result>
         </action>
 
         <action name="Missing">

Copied: struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HelloTest.java (from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HomeTest.java)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HelloTest.java?p2=struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HelloTest.java&p1=struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HomeTest.java&r1=391792&r2=391814&rev=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HomeTest.java (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/test/HelloTest.java Wed Apr  5 14:17:54 2006
@@ -3,14 +3,14 @@
 /**
  * An example text class to verify the configuration.
  */
-public class HomeTest extends TestCase {
+public class HelloTest extends TestCase {
 
     /**
      * An example test that asserts true.
      *
      * @throws Exception On invalid assertions
      */
-    public void testHomeAction() throws Exception {
+    public void testHelloAction() throws Exception {
         assertTrue(true);
     }
 }

Modified: struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/web.xml?rev=391814&r1=391813&r2=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/web.xml (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/WEB-INF/web.xml Wed Apr  5 14:17:54 2006
@@ -4,6 +4,11 @@
 
     <display-name>WebWork Application</display-name>
 
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath*:applicationContext*.xml</param-value>
+    </context-param>
+
     <filter>
         <filter-name>webwork</filter-name>
         <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>

Copied: struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Hello.jsp (from r391792, struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Home.jsp)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Hello.jsp?p2=struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Hello.jsp&p1=struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Home.jsp&r1=391792&r2=391814&rev=391814&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Home.jsp (original)
+++ struts/sandbox/trunk/mailreader-course/action2/lab-1-1-src/src/webapp/pages/Hello.jsp Wed Apr  5 14:17:54 2006
@@ -3,10 +3,10 @@
 
 <html>
 <head>
-    <title>Home</title>
+    <title>Hello</title>
 </head>
 
 <body>
-<h2><ww:text name="home.nessage"/></h2>
+<h2><ww:text name="hello.nessage"/></h2>
 </body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org