Return-Path: 
 <commits-return-30-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 11337 invoked from network); 4 May 2006 02:25:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 May 2006 02:25:57 -0000
Received: (qmail 86911 invoked by uid 500); 4 May 2006 02:25:55 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 86454 invoked by uid 500); 4 May 2006 02:25:53 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 86445 invoked by uid 99); 4 May 2006 02:25:53 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2006 19:25:53 -0700
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 May 2006 19:25:52 -0700
Received: (qmail 11255 invoked by uid 65534); 4 May 2006 02:25:32 -0000
Message-ID: <20060504022532.11253.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r399512 - in /struts/action/trunk: apps/pom.xml
 integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
Date: Thu, 04 May 2006 02:25:31 -0000
To: commits@struts.apache.org
From: wsmoak@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: wsmoak
Date: Wed May  3 19:25:29 2006
New Revision: 399512

URL: http://svn.apache.org/viewcvs?rev=399512&view=rev
Log:
Corrected the location of the source code in the example apps.
Issue:  STR-2855
Reported By: Michael Jouravlev

Modified:
    struts/action/trunk/apps/pom.xml
    struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java

Modified: struts/action/trunk/apps/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=399512&r1=399511&r2=399512&view=diff
==============================================================================
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Wed May  3 19:25:29 2006
@@ -81,7 +81,7 @@
                </configuration>
             </configuration>
          </plugin>
-         <!-- Include source code under WEB-INF/src -->
+         <!-- Include source code under WEB-INF/src/java -->
          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
@@ -89,7 +89,7 @@
                   <phase>process-sources</phase>
                   <configuration>
                      <tasks>
-                        <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src"
+                        <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
                               failonerror="false">
                            <fileset dir="${basedir}/src/main/java"/>
                         </copy>

Modified: struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java?rev=399512&r1=399511&r2=399512&view=diff
==============================================================================
--- struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java (original)
+++ struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java Wed May  3 19:25:29 2006
@@ -27,8 +27,8 @@
 import junit.framework.TestSuite;
 
 /**
- * Verify that each of the example apps starts and displays its
- * default page.
+ * Verify that each of the example apps starts and (at least)
+ * displays its default page.
  */
 public class AppsTest extends TestCase {
 
@@ -81,7 +81,21 @@
 
         assertEquals("Struts Cookbook", page.getTitleText());
     }
+    
+    /**
+     * Verify that the view source function is working
+     * in the Struts Cookbook app.
+     */
+    public void testStrutsCookbookViewSource() throws Exception {
+        WebClient webClient = new WebClient();
+        URL url = new URL("http://localhost:"
+                + port + "/struts-cookbook-" + version + "/source.jsp"
+                + "?src=/WEB-INF/src/java/examples/SuccessAction.java");
+        HtmlPage page = (HtmlPage) webClient.getPage(url);
 
+        assertEquals("View Source", page.getTitleText());
+    }
+    
     /**
      * Verify that the Struts Examples app has started
      */