svn commit: r399975 - in /struts/action/trunk: apps/faces-example1/ apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ integration/apps-it/src/test/java/org/apache/struts/apps/

[wsmoak]

Author: wsmoak
Date: Thu May  4 22:47:41 2006
New Revision: 399975

URL: http://svn.apache.org/viewcvs?rev=399975&view=rev
Log:
Add missing dependencies and a test for the first Struts Faces example app.
Remove old version number from the index page title.

Modified:
    struts/action/trunk/apps/faces-example1/pom.xml
    
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ApplicationResources.properties
    
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
    
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java

Modified: struts/action/trunk/apps/faces-example1/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/pom.xml?rev=399975&r1=399974&r2=399975&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example1/pom.xml (original)
+++ struts/action/trunk/apps/faces-example1/pom.xml Thu May  4 22:47:41 2006
@@ -61,12 +61,41 @@
             <artifactId>myfaces-jsf-api</artifactId>
             <version>1.0.9</version>
          </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>jstl</artifactId>
+         <version>1.0.2</version>
+      </dependency>
+      <dependency>
+         <groupId>taglibs</groupId>
+         <artifactId>standard</artifactId>
+         <version>1.0.2</version>
+      </dependency>
 
+      <!-- Required by MyFaces -->
+      <dependency>
+         <groupId>commons-codec</groupId>
+         <artifactId>commons-codec</artifactId>
+         <version>1.2</version>
+      </dependency>
+      <dependency>
+         <groupId>commons-el</groupId>
+         <artifactId>commons-el</artifactId>
+         <version>1.0</version>
+      </dependency>
 
    </dependencies>
    
    <build>
-     <finalName>${pom.artifactId}</finalName>
+      <resources>
+         <resource>
+            <directory>src/main/java</directory>
+            <includes>
+               <include>**/*.properties</include>
+            </includes>
+         </resource>
+      </resources>
+      <finalName>${pom.artifactId}</finalName>
    </build>
 
 </project>

Modified: 
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ApplicationResources.properties
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ApplicationResources.properties?rev=399975&r1=399974&r2=399975&view=diff
==============================================================================
--- 
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ApplicationResources.properties
 (original)
+++ 
struts/action/trunk/apps/faces-example1/src/main/java/org/apache/struts/webapp/example/ApplicationResources.properties
 Thu May  4 22:47:41 2006
@@ -57,7 +57,7 @@
 index.heading=MailReader Demonstration Application Options
 index.logon=Log on to the MailReader Demonstration Application
 index.registration=Register with the MailReader Demonstration Application
-index.title=MailReader Demonstration Application (Struts 1.1-dev)
+index.title=MailReader Demonstration Application
 index.tour=A Walking Tour of the Example Application
 linkSubscription.io=I/O Error: {0}
 linkSubscription.noSubscription=No subscription under attribute {0}

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=399975&r1=399974&r2=399975&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
 Thu May  4 22:47:41 2006
@@ -108,6 +108,18 @@
         assertEquals("Struts Examples", page.getTitleText());
     }
 
+    /**
+     * Verify that the Struts Faces Example 1 app has started
+     */
+    public void testStrutsFacesExample1() throws Exception {
+        WebClient webClient = new WebClient();
+        URL url = new URL("http://localhost:";
+                + port + "/struts-faces-example1-" + version);
+        HtmlPage page = (HtmlPage) webClient.getPage(url);
+
+        assertEquals("MailReader Demonstration Application",
+                page.getTitleText());
+    }
 
     /**
      * Verify that the Struts Mailreader app has started

Modified: 
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java?rev=399975&r1=399974&r2=399975&view=diff
==============================================================================
--- 
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
 (original)
+++ 
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
 Thu May  4 22:47:41 2006
@@ -85,6 +85,7 @@
         configuration.addDeployable(getWAR("struts-blank"));
         configuration.addDeployable(getWAR("struts-cookbook"));
         configuration.addDeployable(getWAR("struts-examples"));
+        configuration.addDeployable(getWAR("struts-faces-example1"));
         configuration.addDeployable(getWAR("struts-mailreader"));
         configuration.addDeployable(getWAR("struts-scripting-mailreader"));
         configuration.addDeployable(getWAR("strutsel-exercise-taglib"));