svn commit: r399736 - /incubator/webwork2/thirdparty/pell-file-upload/pom.xml
Author: tmjee Date: Thu May 4 08:32:53 2006 New Revision: 399736 URL: http://svn.apache.org/viewcvs?rev=399736&view=rev Log: added dependency on commons-logging which the PellMultipartRequest.java used to make IDE specific files generated by maven happy about it. Modified: incubator/webwork2/thirdparty/pell-file-upload/pom.xml Modified: incubator/webwork2/thirdparty/pell-file-upload/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/thirdparty/pell-file-upload/pom.xml?rev=399736&r1=399735&r2=399736&view=diff == --- incubator/webwork2/thirdparty/pell-file-upload/pom.xml (original) +++ incubator/webwork2/thirdparty/pell-file-upload/pom.xml Thu May 4 08:32:53 2006 @@ -22,6 +22,11 @@ javax.servlet servlet-api provided - + + + + commons-logging + commons-logging +
svn commit: r399762 - in /struts/action/trunk/integration/tg4w: ./ pom.xml src/ src/main/ src/main/java/ src/main/scripts/ src/main/scripts/blank-verify-welcome.xml src/test/ src/test/java/
Author: jmitchell
Date: Thu May 4 09:57:46 2006
New Revision: 399762
URL: http://svn.apache.org/viewcvs?rev=399762&view=rev
Log:
Initial stab at TestGen4Web maven plugin.
I still need to provide detailed instructions (ya, it's on my todo list :) ),
but basically, just do this:
- build and deploy the struts-blank.war sample app
- cd to this dir
- $mvn test
You'll see the dependencies downloaded and the test generated and run. You'll
also see the output as the test proceeds (assertions, etc), which is part of
the underlying TestGen4Web sysouts.
If you feel really adventurous, install that ff plugin into your own ff and
record your own steps and save it to src/main/scripts and run the test again.
Where I the most benefit with this new plugin is in doing 'smoke tests' of the
same apps. This can be an invaluable time saver during releases (assuming
people go out and create a bunch of scripts agains the apps.
One more note, the actual plugin and pathes against the translator for
TestGen4Web are not hosted here at Apache. The plugin itself can be used
against any url, web or local, and any language (Java/Servlet, Java/JSF, PHP,
Perl, whatever).
Please give it a try. Thanks.
Added:
struts/action/trunk/integration/tg4w/
struts/action/trunk/integration/tg4w/pom.xml (with props)
struts/action/trunk/integration/tg4w/src/
struts/action/trunk/integration/tg4w/src/main/
struts/action/trunk/integration/tg4w/src/main/java/
struts/action/trunk/integration/tg4w/src/main/scripts/
struts/action/trunk/integration/tg4w/src/main/scripts/blank-verify-welcome.xml
(with props)
struts/action/trunk/integration/tg4w/src/test/
struts/action/trunk/integration/tg4w/src/test/java/
Added: struts/action/trunk/integration/tg4w/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/tg4w/pom.xml?rev=399762&view=auto
==
--- struts/action/trunk/integration/tg4w/pom.xml (added)
+++ struts/action/trunk/integration/tg4w/pom.xml Thu May 4 09:57:46 2006
@@ -0,0 +1,95 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ 4.0.0
+ org.apache.struts.action
+ struts-action-it-httpunit-taglib
+ 0.1-SNAPSHOT
+ jar
+ Struts Action - Taglib (HttpUnit) Tests
+
+
+ src/main/java
+
${project.build.directory}/generated-tests/tg4w-httpunit
+
+
+
+net.sf.tools4java
+maven-testgen4web-plugin
+
+
+ translate-and-compile-testgen4web-tests
+ generate-test-sources
+
+
src/main/scripts/
+
${project.build.directory}/generated-tests/tg4w-httpunit
+
+
+ testgen4web
+
+
+
+
+
+
+
+
+ junit
+ junit
+ 3.8.1
+
+
+
+
+
+
+ net.sf.tools4java
+ maven-testgen4web-plugin
+ 0.1-SNAPSHOT
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-report-plugin
+
+
+
+
+
+
+net.sf.tools4java
+Tools4Java Maven Repository (TestGen4Web)
+http://tools4java.sourceforge.net/m2/
+true
+true
+
+
+
+
Propchange: struts/action/trunk/integration/tg4w/pom.xml
--
svn:eol-style = native
Added:
struts/action/trunk/integration/tg4w/src/main/scripts/blank-verify-welcome.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/tg4w/src/main/scripts/blank-verify-welcome.xml?rev=399762&view=auto
==
---
struts/action/trunk/integration/tg4w/src/main/scripts/blank-verify-welcome.xml
(added)
+++
struts/action/trunk/integration/tg4w/src/main/scripts/blank-verify-welcome.xml
Thu May 4 09:57:46 2006
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Propchange:
struts/action/trunk/integration/tg4w/src/main/scripts/blank-verify-welcome.xml
--
svn:eol-style = native
svn commit: r399763 - /incubator/webwork2/pom.xml
Author: tmjee Date: Thu May 4 10:00:09 2006 New Revision: 399763 URL: http://svn.apache.org/viewcvs?rev=399763&view=rev Log: changed nanocontainer-nanowar's version from 1.0 to 1.0-SNAPSHOT, cause there's not yet a 1.0 release from CodeHaus, just pre 1.0, so that maven will not complain when running some of its lifecycle. Modified: incubator/webwork2/pom.xml Modified: incubator/webwork2/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=399763&r1=399762&r2=399763&view=diff == --- incubator/webwork2/pom.xml (original) +++ incubator/webwork2/pom.xml Thu May 4 10:00:09 2006 @@ -424,7 +424,7 @@ nanocontainer nanocontainer-nanowar -1.0 +1.0-SNAPSHOT
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/
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 @@
myfaces-jsf-api
1.0.9
+
+ javax.servlet
+ jstl
+ 1.0.2
+
+
+ taglibs
+ standard
+ 1.0.2
+
+
+
+ commons-codec
+ commons-codec
+ 1.2
+
+
+ commons-el
+ commons-el
+ 1.0
+
- ${pom.artifactId}
+
+
+src/main/java
+
+ **/*.properties
+
+
+
+ ${pom.artifactId}
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"));
svn commit: r399985 - /struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
Author: wsmoak Date: Thu May 4 23:15:57 2006 New Revision: 399985 URL: http://svn.apache.org/viewcvs?rev=399985&view=rev Log: Correct the Mailreader Tour link. Submitted by: Gary VanMatre Issue: STR-2509 Modified: struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml Modified: struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml?rev=399985&r1=399984&r2=399985&view=diff == --- struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml (original) +++ struts/action/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml Thu May 4 23:15:57 2006 @@ -153,7 +153,7 @@ +include="/tour.htm">
svn commit: r399989 - /struts/action/trunk/faces/src/main/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java
Author: wsmoak Date: Thu May 4 23:30:55 2006 New Revision: 399989 URL: http://svn.apache.org/viewcvs?rev=399989&view=rev Log: Change the signature of the call to get the ModuleConfig to use the ServletContext. This was raising a NPE when not dispatched through the request processor first. This also fixes the "Log on" link in the Faces Mailreader (example1). Issue: STR-2509 Submitted by: Gary VanMatre Modified: struts/action/trunk/faces/src/main/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java Modified: struts/action/trunk/faces/src/main/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/src/main/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java?rev=399989&r1=399988&r2=399989&view=diff == --- struts/action/trunk/faces/src/main/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java (original) +++ struts/action/trunk/faces/src/main/java/org/apache/struts/faces/taglib/JavascriptValidatorTag.java Thu May 4 23:30:55 2006 @@ -34,6 +34,7 @@ import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; +import javax.servlet.ServletContext; import org.apache.commons.validator.Field; import org.apache.commons.validator.Form; @@ -270,7 +271,9 @@ StringBuffer results = new StringBuffer(); HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); -ModuleConfig config = ModuleUtils.getInstance().getModuleConfig(request); +ServletContext servletContext = pageContext.getServletContext(); +ModuleConfig config = ModuleUtils.getInstance().getModuleConfig(request, servletContext); + ValidatorResources resources = (ValidatorResources) pageContext.getAttribute( ValidatorPlugIn.VALIDATOR_KEY + config.getPrefix(),
