diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 3e416401a..e5072276a 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -181,6 +181,32 @@ 1.1.1 + + net.sourceforge.jwebunit + jwebunit-core + 1.4.1 + test + + + + commons-httpclient + commons-httpclient + 3.1 + test + + + + net.sourceforge.jwebunit + jwebunit-htmlunit-plugin + 1.4.1 + test + + + xom + xom + + + @@ -211,19 +237,52 @@ + + org.twdata.maven + maven-itblast-plugin + 0.3 + + + integration-test + + execute + + + tomcat5x,jetty6x,jboss42x,resin3x + + + + + + maven-surefire-plugin + + + it/** + **/*$* + + + - - - - src/main/resources - - - src/main/java - - **/*.java - - - + + + + + src/main/resources + + + src/main/java + + **/*.java + + + + + + twdata-m2-repository + twdata.org Maven Repository + http://twdata-m2-repository.googlecode.com/svn/ + + diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml index 3c3cd7cd6..0fcb2a3dc 100644 --- a/apps/showcase/src/main/resources/struts-tags-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-ui.xml @@ -3,7 +3,7 @@ - + @@ -40,26 +40,30 @@ - + /tags/ui/treeExampleDynamic.jsp - + - + /tags/ui/treeExampleAjaxDynamic.jsp - + /tags/ui/componentTagExample.jsp - + + + /tags/ui/actionTagExampleCalled.jsp + /tags/ui/actionTagExampleCalling.jsp + - + - - + + /tags/ui/staticTreeSelect.jsp @@ -68,6 +72,6 @@ /tags/ui/dynamicTreeSelect.jsp - + diff --git a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp new file mode 100644 index 000000000..0c496a901 --- /dev/null +++ b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalled.jsp @@ -0,0 +1,2 @@ +<%@taglib prefix="s" uri="/struts-tags" %> +This text is from the called class \ No newline at end of file diff --git a/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp new file mode 100644 index 000000000..42b02c2a1 --- /dev/null +++ b/apps/showcase/src/main/webapp/tags/ui/actionTagExampleCalling.jsp @@ -0,0 +1,14 @@ +<%@taglib prefix="s" uri="/struts-tags" %> + + + +Showcase - Tags - UI Tags - Action Tag + + + Example 1: + This example calls an action and includes the output on the page +

+ +

+ + \ No newline at end of file diff --git a/apps/showcase/src/main/webapp/tags/ui/example.jsp b/apps/showcase/src/main/webapp/tags/ui/example.jsp index 53cc8e01e..c8435789e 100644 --- a/apps/showcase/src/main/webapp/tags/ui/example.jsp +++ b/apps/showcase/src/main/webapp/tags/ui/example.jsp @@ -16,8 +16,8 @@ - @@ -25,13 +25,13 @@ tooltip="Select Your Birthday" label="Birthday" name="birthday" /> - + - + - + - + - - + + - + diff --git a/apps/showcase/src/main/webapp/tags/ui/index.jsp b/apps/showcase/src/main/webapp/tags/ui/index.jsp index 5005be75f..cd14b48d4 100644 --- a/apps/showcase/src/main/webapp/tags/ui/index.jsp +++ b/apps/showcase/src/main/webapp/tags/ui/index.jsp @@ -6,7 +6,7 @@

UI Tags

- +