From 957ad9611047fa5520f1501b2328b2c22a72f848 Mon Sep 17 00:00:00 2001 From: Ted Nathan Husted Date: Fri, 21 Jul 2006 01:04:41 +0000 Subject: [PATCH] ww-1367 Update applications and taglib references. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@424152 13f79535-47bb-0310-9956-ffa450edef68 --- ant-build/ivy.xml | 13 +- .../src/main/webapp/WEB-INF/pages/home.jsp | 2 +- apps/blank/src/main/webapp/WEB-INF/web.xml | 8 +- apps/build.xml | 254 +++++++++--------- .../src/main/webapp/pages/ChangePassword.jsp | 2 +- .../src/main/webapp/pages/Error.jsp | 2 +- .../src/main/webapp/pages/Footer.jsp | 2 +- .../src/main/webapp/pages/Logon.jsp | 2 +- .../src/main/webapp/pages/MainMenu.jsp | 2 +- .../src/main/webapp/pages/Registration.jsp | 2 +- .../src/main/webapp/pages/Subscription.jsp | 2 +- .../src/main/webapp/pages/Welcome.jsp | 2 +- apps/pom.xml | 2 +- .../main/webapp/WEB-INF/edit/formExample.jsp | 6 +- .../webapp/WEB-INF/edit/formExampleInput.jsp | 12 +- .../src/main/webapp/WEB-INF/edit/index.jsp | 10 +- .../webapp/WEB-INF/edit/namespaceTest.jsp | 6 +- .../main/webapp/WEB-INF/edit/prefsForm.jsp | 8 +- .../src/main/webapp/WEB-INF/edit/test.jsp | 6 +- .../main/webapp/WEB-INF/view/ajaxExample.jsp | 48 ++-- .../main/webapp/WEB-INF/view/formExample.jsp | 6 +- .../webapp/WEB-INF/view/formExampleInput.jsp | 12 +- .../view/formExampleInputValidation.jsp | 14 +- .../src/main/webapp/WEB-INF/view/index.jsp | 20 +- .../webapp/WEB-INF/view/springExample.jsp | 18 +- .../main/webapp/WEB-INF/view/tokenExample.jsp | 4 +- .../webapp/WEB-INF/view/tokenExampleInput.jsp | 30 +-- .../main/webapp/WEB-INF/decorators/main.jsp | 30 +-- apps/shopping-cart/src/main/webapp/cart.jsp | 6 +- .../src/main/webapp/category-main.jsp | 6 +- .../src/main/webapp/category.jsp | 42 +-- .../src/main/webapp/categorySet.jsp | 4 +- .../filedownload/FileDownloadAction.java | 2 +- .../src/main/resources/struts.properties | 2 +- .../webapp/WEB-INF/applicationContext.xml | 70 ++--- .../main/webapp/WEB-INF/decorators/main.jsp | 54 ++-- .../actionchaining/actionChainingResult.jsp | 12 +- .../src/main/webapp/ajax/AjaxResult.jsp | 4 +- .../src/main/webapp/ajax/AjaxResult3.jsp | 6 +- .../src/main/webapp/ajax/commonInclude.jsp | 4 +- apps/showcase/src/main/webapp/ajax/footer.jsp | 10 +- .../main/webapp/ajax/remotediv/example1.jsp | 8 +- .../main/webapp/ajax/remotediv/example2.jsp | 8 +- .../main/webapp/ajax/remotediv/example3.jsp | 8 +- .../main/webapp/ajax/remotediv/example4.jsp | 8 +- .../main/webapp/ajax/remotediv/example5.jsp | 8 +- .../main/webapp/ajax/remotediv/example6.jsp | 8 +- .../main/webapp/ajax/remotediv/example7.jsp | 8 +- .../main/webapp/ajax/remotediv/example8.jsp | 8 +- .../src/main/webapp/ajax/remotediv/index.jsp | 6 +- .../main/webapp/ajax/remoteforms/index.jsp | 40 +-- .../main/webapp/ajax/remoteforms/test1.jsp | 14 +- .../main/webapp/ajax/remoteforms/test2.jsp | 8 +- .../src/main/webapp/ajax/remotelink/index.jsp | 66 ++--- .../main/webapp/ajax/tabbedpanel/example1.jsp | 130 ++++----- .../main/webapp/ajax/tabbedpanel/example2.jsp | 36 +-- .../main/webapp/ajax/tabbedpanel/example3.jsp | 44 +-- .../main/webapp/ajax/tabbedpanel/index.jsp | 8 +- .../src/main/webapp/ajax/tree/getCategory.jsp | 28 +- .../src/main/webapp/ajax/tree/toggle.jsp | 6 +- .../src/main/webapp/ajax/tree/tree.jsp | 6 +- .../src/main/webapp/ajax/widgets/index.jsp | 24 +- .../webapp/conversion/enterPersonInfo.jsp | 78 +++--- .../src/main/webapp/conversion/index.jsp | 4 +- .../main/webapp/conversion/showPersonInfo.jsp | 10 +- .../customTheme/jspCustomTemplate.jsp | 4 +- apps/showcase/src/main/webapp/date.jsp | 4 +- .../main/webapp/empmanager/editEmployee.jsp | 54 ++-- .../src/main/webapp/empmanager/editSkill.jsp | 36 +-- .../src/main/webapp/empmanager/index.jsp | 14 +- .../main/webapp/empmanager/listEmployees.jsp | 16 +- .../src/main/webapp/empmanager/listSkills.jsp | 14 +- .../src/main/webapp/filedownload/index.jsp | 4 +- .../main/webapp/fileupload/upload-success.jsp | 10 +- .../src/main/webapp/fileupload/upload.jsp | 12 +- .../src/main/webapp/freemarker/index.jsp | 18 +- apps/showcase/src/main/webapp/help.jsp | 12 +- apps/showcase/src/main/webapp/jsf/index.jsp | 10 +- .../main/webapp/modelDriven/modelDriven.jsp | 42 +-- .../webapp/modelDriven/modelDrivenResult.jsp | 28 +- .../src/main/webapp/person/editPeople.jsp | 18 +- apps/showcase/src/main/webapp/showcase.jsp | 64 ++--- apps/showcase/src/main/webapp/tags/index.jsp | 6 +- .../webapp/tags/non-ui/actionPrefix/index.jsp | 6 +- .../non-ui/actionTag/showActionTagDemo.jsp | 24 +- .../src/main/webapp/tags/non-ui/date.jsp | 40 +-- .../src/main/webapp/tags/non-ui/index.jsp | 16 +- .../appendIteratorTagDemoResult.jsp | 30 +-- .../iteratorGeneratorTagDemoResult.jsp | 16 +- .../mergeIteratorTagDemoResult.jsp | 28 +- .../iteratorTag/showAppendIteratorTagDemo.jsp | 16 +- .../showIteratorGeneratorTagDemo.jsp | 22 +- .../iteratorTag/showMergeIteratorTagDemo.jsp | 12 +- .../iteratorTag/subsetIteratorTagDemo.jsp | 18 +- .../subsetIteratorTagDemoResult.jsp | 18 +- .../webapp/tags/ui/componentTagExample.jsp | 68 ++--- .../main/webapp/tags/ui/dynamicTreeSelect.jsp | 6 +- .../src/main/webapp/tags/ui/example.jsp | 190 ++++++------- .../main/webapp/tags/ui/exampleSubmited.jsp | 62 ++--- .../src/main/webapp/tags/ui/index.jsp | 28 +- .../tags/ui/lotsOfOptiontransferselect.jsp | 200 +++++++------- .../ui/lotsOfOptiontransferselectSubmit.jsp | 184 ++++++------- .../main/webapp/tags/ui/staticTreeSelect.jsp | 26 +- .../webapp/tags/ui/treeExampleDynamic.jsp | 42 +-- .../main/webapp/tags/ui/treeExampleStatic.jsp | 54 ++-- .../main/webapp/template/xhtml/mytemplate.jsp | 4 +- .../src/main/webapp/token/doublePost.jsp | 4 +- .../src/main/webapp/token/example1.jsp | 16 +- .../src/main/webapp/token/example2.jsp | 16 +- .../src/main/webapp/token/example3.jsp | 16 +- apps/showcase/src/main/webapp/token/index.jsp | 2 +- .../src/main/webapp/token/transferDone.jsp | 10 +- .../clientSideValidationExample.jsp | 72 ++--- .../validation/fieldValidatorsExample.jsp | 88 +++--- .../src/main/webapp/validation/footer.jsp | 12 +- .../src/main/webapp/validation/index.jsp | 64 ++--- .../validation/nonFieldValidatorsExample.jsp | 60 ++--- .../src/main/webapp/validation/quiz-ajax.jsp | 16 +- .../src/main/webapp/validation/quiz-basic.jsp | 16 +- .../webapp/validation/quiz-client-css.jsp | 16 +- .../main/webapp/validation/quiz-client.jsp | 16 +- .../main/webapp/validation/quiz-success.jsp | 6 +- .../successClientSideValidationExample.jsp | 88 +++--- .../successFieldValidatorsExample.jsp | 82 +++--- .../successNonFieldValidatorsExample.jsp | 50 ++-- .../successVisitorValidatorsExample.jsp | 52 ++-- .../validation/visitorValidatorsExample.jsp | 44 +-- .../src/main/webapp/wait/complete.jsp | 4 +- .../src/main/webapp/wait/example1.jsp | 10 +- .../src/main/webapp/wait/example2.jsp | 10 +- .../src/main/webapp/wait/example3.jsp | 10 +- apps/showcase/src/main/webapp/wait/index.jsp | 2 +- apps/showcase/src/main/webapp/wait/wait.jsp | 6 +- .../main/webapp/WEB-INF/pages/hellomatrix.jsp | 10 +- .../src/main/webapp/WEB-INF/pages/home.jsp | 6 +- apps/starter/src/main/webapp/WEB-INF/web.xml | 8 +- build.xml | 12 +- core/src/main/etc/README.txt | 8 +- core/src/main/etc/taglib-settings.xml | 4 +- .../apache/struts2/components/Component.java | 24 +- .../apache/struts2/components/DatePicker.java | 7 +- .../apache/struts2/components/OptGroup.java | 62 ++--- .../MultiWebApplicationContext.java | 12 +- .../org/apache/struts2/util/MakeIterator.java | 2 - .../views/freemarker/FreemarkerManager.java | 14 +- core/src/main/resources/META-INF/taglib.tld | 4 +- .../org/apache/struts2/default.properties | 4 +- .../main/xdt/{taglib_tld.xdt => tags_tld.xdt} | 0 .../test/resources/template/test/checkbox.jsp | 18 +- docs/tags/DatePicker.html | 2 +- src/site/site.xml | 26 +- src/site/xdoc/index.xml | 26 +- 152 files changed, 1927 insertions(+), 1905 deletions(-) rename core/src/main/xdt/{taglib_tld.xdt => tags_tld.xdt} (100%) diff --git a/ant-build/ivy.xml b/ant-build/ivy.xml index 6b7b277df..3f8fb4884 100644 --- a/ant-build/ivy.xml +++ b/ant-build/ivy.xml @@ -1,19 +1,18 @@ - - - WebWork is a Java web-application development framework. It is built specifically with developer - productivity and code simplicity in mind. WebWork is built on + + Struts 2 is a Java web-application development framework. It is built specifically with developer + productivity and code simplicity in mind. Struts 2 is built on top of XWork, which provides a generic command pattern framework as well as an Inversion of Control - container. In addition to these features, WebWork provides - robust support for building reusable UI templates, such as form controls, UI themes, internationalization, + container. In addition to these features, Struts 2 provides robust support for building reusable UI templates, such as form controls, UI themes, internationalization, dynamic form parameter mapping to JavaBeans, robust client and server side validation, and much more. @@ -44,7 +43,7 @@ - + diff --git a/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp b/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp index 3bee71ff6..cbe91a731 100644 --- a/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp +++ b/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml index 07ec4949d..5ce46eb38 100644 --- a/apps/blank/src/main/webapp/WEB-INF/web.xml +++ b/apps/blank/src/main/webapp/WEB-INF/web.xml @@ -25,12 +25,12 @@ diff --git a/apps/build.xml b/apps/build.xml index 53f7e4c09..a9e88e4dc 100644 --- a/apps/build.xml +++ b/apps/build.xml @@ -1,8 +1,8 @@ - - + + - - + + o To create a new webapp structure, simply run ant new @@ -31,38 +31,38 @@ For example: ant build-portlet -Dcontainer=jboss-portal-2.2 - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -100,16 +100,16 @@ - - - - - + + + + + - - - - + + + + @@ -159,8 +159,8 @@ @@ -201,96 +201,96 @@ - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp b/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp index d99dc99b9..7d9861f49 100644 --- a/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp +++ b/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/mailreader/src/main/webapp/pages/Error.jsp b/apps/mailreader/src/main/webapp/pages/Error.jsp index 15b80cb75..1d955f417 100644 --- a/apps/mailreader/src/main/webapp/pages/Error.jsp +++ b/apps/mailreader/src/main/webapp/pages/Error.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/mailreader/src/main/webapp/pages/Footer.jsp b/apps/mailreader/src/main/webapp/pages/Footer.jsp index ce543f8fb..f9b089377 100644 --- a/apps/mailreader/src/main/webapp/pages/Footer.jsp +++ b/apps/mailreader/src/main/webapp/pages/Footer.jsp @@ -1,4 +1,4 @@ -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %>

diff --git a/apps/mailreader/src/main/webapp/pages/Logon.jsp b/apps/mailreader/src/main/webapp/pages/Logon.jsp index 8b2aa065c..16d50039d 100644 --- a/apps/mailreader/src/main/webapp/pages/Logon.jsp +++ b/apps/mailreader/src/main/webapp/pages/Logon.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/mailreader/src/main/webapp/pages/MainMenu.jsp b/apps/mailreader/src/main/webapp/pages/MainMenu.jsp index 187278cbc..9b958ecca 100644 --- a/apps/mailreader/src/main/webapp/pages/MainMenu.jsp +++ b/apps/mailreader/src/main/webapp/pages/MainMenu.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/mailreader/src/main/webapp/pages/Registration.jsp b/apps/mailreader/src/main/webapp/pages/Registration.jsp index 33d8e05a7..cd624ccc3 100644 --- a/apps/mailreader/src/main/webapp/pages/Registration.jsp +++ b/apps/mailreader/src/main/webapp/pages/Registration.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/mailreader/src/main/webapp/pages/Subscription.jsp b/apps/mailreader/src/main/webapp/pages/Subscription.jsp index 0af768e09..c1974e84c 100644 --- a/apps/mailreader/src/main/webapp/pages/Subscription.jsp +++ b/apps/mailreader/src/main/webapp/pages/Subscription.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/mailreader/src/main/webapp/pages/Welcome.jsp b/apps/mailreader/src/main/webapp/pages/Welcome.jsp index 40388f0dc..8cb2c78a4 100644 --- a/apps/mailreader/src/main/webapp/pages/Welcome.jsp +++ b/apps/mailreader/src/main/webapp/pages/Welcome.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib uri="/struts-action" prefix="s" %> +<%@ taglib prefix="s" uri="/tags" %> diff --git a/apps/pom.xml b/apps/pom.xml index fd61b1174..8fadd050c 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -23,7 +23,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts-action2/apps + scp://people.apache.org/www/struts.apache.org/struts2/apps diff --git a/apps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp index 7ddc6e431..2653c6396 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp @@ -1,5 +1,5 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> -

Hello

+

Hello

-">Back to front page +">Back to front page diff --git a/apps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp index dd2832e1f..1fd044ed8 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp @@ -1,8 +1,8 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %>

Input your name

- - - - - + + + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/edit/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/index.jsp index 1fd0dd037..8cf035e23 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/edit/index.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/edit/index.jsp @@ -1,11 +1,11 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> There are no examples in edit mode yet

-">Test +">Test

-">Form test +">Form test

-">Dummy test +">Dummy test

-">Back to view mode +">Back to view mode diff --git a/apps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp index b2530b4b8..48a3fe2f7 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> -">Test page for namespace /edit/test +<%@ taglib prefix="s" uri="/tags" %> +">Test page for namespace /edit/test

-">Back to edit index +">Back to edit index diff --git a/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp index 56bbafd16..ccb90b419 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp @@ -1,7 +1,7 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <%@ taglib prefix="pw" uri="/portletwork" %> - - - + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/edit/test.jsp b/apps/portlet/src/main/webapp/WEB-INF/edit/test.jsp index 440a0fbec..a8099d01d 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/edit/test.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/edit/test.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> -">Test page +<%@ taglib prefix="s" uri="/tags" %> +">Test page

-">Back to edit index +">Back to edit index diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp index 38f547401..f9f6c91bc 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp @@ -1,40 +1,40 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> - -"> +<%@ taglib prefix="s" uri="/tags" %> + +"> This is a tabbed pane with two panels that fetches data from a remote action via ajax - - + + This is the left pane
- -
- - - - - + +
+ + + + + middle tab
- -
- - - - - + +
+ + + + +

A DIV that waits for 5 seconds before loading the contents - - Waiting for data + Waiting for data

A DIV that is updated every 2 seconds -Initial Content - +

-">Back to front page +">Back to front page diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp index 7ddc6e431..2653c6396 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp @@ -1,5 +1,5 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> -

Hello

+

Hello

-">Back to front page +">Back to front page diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp index 126085c1e..38485a2ae 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp @@ -1,8 +1,8 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %>

Input your name

- - - - - + + + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp index 6cd7f0164..f87a0313f 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp @@ -1,8 +1,8 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> -"> +<%@ taglib prefix="s" uri="/tags" %> +">

Input your name

- - - - - + + + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp index 56feda085..cc9a14d11 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp @@ -1,15 +1,15 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %>

Welcome to the Struts example portlet

Here you'll find examples of what is possible with the PortletWork framework.

diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp index e8e803fbb..193e40e29 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp @@ -1,16 +1,16 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %>

Example of Spring managed singleton. All the 'things' are contained in a Spring defined ThingManager

Things in the list:

- -
- + +
+

- - - - + + + +

-">Back to front page +">Back to front page diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp index 8405c40a8..76dd0a140 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp @@ -1,5 +1,5 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %>

The form was successfully submitted with a valid token

-"/>Back to front page +"/>Back to front page diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp index e281868e6..5b3f0e7f4 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp @@ -1,20 +1,20 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> - +<%@ taglib prefix="s" uri="/tags" %> + ERROR:
- -
- + +
+ - +

Form with invalid token

- - - - + + + +

Form with valid token

- - - - - + + + + + diff --git a/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp index 918441233..555d70c95 100644 --- a/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp @@ -5,23 +5,23 @@ %> <%@ taglib uri="sitemesh-decorator" prefix="decorator" %> <%@ taglib uri="sitemesh-page" prefix="page" %> -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <decorator:title default="CSS Template"/> - - - - - + + + + + - - + + - + @@ -110,7 +110,7 @@
-

diff --git a/apps/shopping-cart/src/main/webapp/cart.jsp b/apps/shopping-cart/src/main/webapp/cart.jsp index fddc647c6..a58ea9ffc 100644 --- a/apps/shopping-cart/src/main/webapp/cart.jsp +++ b/apps/shopping-cart/src/main/webapp/cart.jsp @@ -3,11 +3,11 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>

Shopping Cart

-
Number of Items:
-
Total: $
+
Number of Items:
+
Total: $
diff --git a/apps/shopping-cart/src/main/webapp/category-main.jsp b/apps/shopping-cart/src/main/webapp/category-main.jsp index 893859783..b044ba902 100644 --- a/apps/shopping-cart/src/main/webapp/category-main.jsp +++ b/apps/shopping-cart/src/main/webapp/category-main.jsp @@ -3,7 +3,7 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> Category @@ -11,7 +11,7 @@ -<%----%> - +<%----%> + diff --git a/apps/shopping-cart/src/main/webapp/category.jsp b/apps/shopping-cart/src/main/webapp/category.jsp index 30cd4a1b0..c1e792f25 100644 --- a/apps/shopping-cart/src/main/webapp/category.jsp +++ b/apps/shopping-cart/src/main/webapp/category.jsp @@ -3,46 +3,46 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> - -

>

+ +

>

- - + +
- - - + + +
-
-
$
+
+
$
-
+

- Quantity:  - + Quantity:  +

- - + +
- - + + There are no products in this category - - - + + +

Struts Ajax Catalog

Please choose a category to start shopping.

- + diff --git a/apps/shopping-cart/src/main/webapp/categorySet.jsp b/apps/shopping-cart/src/main/webapp/categorySet.jsp index f98e5d99b..934299125 100644 --- a/apps/shopping-cart/src/main/webapp/categorySet.jsp +++ b/apps/shopping-cart/src/main/webapp/categorySet.jsp @@ -3,6 +3,6 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <%@ page contentType="text/plain;charset=UTF-8" language="java" %> -Category set to +Category set to diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java index bed20f1c8..51040156d 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java @@ -31,7 +31,7 @@ import java.io.InputStream; public class FileDownloadAction implements Action { public InputStream getImageStream() throws Exception { - return ServletActionContext.getServletContext().getResourceAsStream("/images/logo.png"); + return ServletActionContext.getServletContext().getResourceAsStream("/images/struts.gif"); } public String execute() throws Exception { diff --git a/apps/showcase/src/main/resources/struts.properties b/apps/showcase/src/main/resources/struts.properties index c4b7b1bed..e4ccd3b8a 100644 --- a/apps/showcase/src/main/resources/struts.properties +++ b/apps/showcase/src/main/resources/struts.properties @@ -7,6 +7,6 @@ struts.custom.i18n.resources=globalMessages #struts.action.extension=jspa struts.url.http.port = 8080 struts.freemarker.manager.classname=customFreemarkerManager - struts.serve.static=true struts.serve.static.browserCache=false +struts.compatibilityMode = true diff --git a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml index 1bdcee50a..cec8c6871 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml @@ -13,9 +13,9 @@ - - - + + + @@ -26,63 +26,63 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -96,9 +96,9 @@ An animal, men best friend An animal whose child is called kitten A common vehical with 4 wheels - One of the best action based framework from Opensymphony + The premier action-based framework for Java --> - A popular programming language from which WebWork is written off + A popular programming language that is used to create the Struts framework diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 353cfc682..984f6b0d5 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -9,16 +9,16 @@ <%@ taglib uri="sitemesh-decorator" prefix="decorator" %> <%@ taglib uri="sitemesh-page" prefix="page" %> -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> <decorator:title default="Struts Showcase"/> - - - + + + - + + "> + "> + " media="print"> + + "> + "> + " media="print"> + + "> + "> + " media="print"> + --%> diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp b/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp index 371192cf7..963caf33c 100644 --- a/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp +++ b/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp @@ -1,40 +1,40 @@ -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> Showcase - UI Tag Example - Tree Example (Dynamic) - +
- - + +
diff --git a/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp b/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp index f7d6b091e..2943aaee9 100644 --- a/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp +++ b/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp @@ -1,45 +1,45 @@ -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> Showcase - UI Tag Example - Tree Example (Static) - +
- - - - - - - - - - - - - - + + + + + + + + + + + + +
diff --git a/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp b/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp index 12e076782..395976093 100644 --- a/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp +++ b/apps/showcase/src/main/webapp/template/xhtml/mytemplate.jsp @@ -1,9 +1,9 @@ -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %>

JSP Custom Template - -parameter 'paramName' - +parameter 'paramName' -

diff --git a/apps/showcase/src/main/webapp/token/doublePost.jsp b/apps/showcase/src/main/webapp/token/doublePost.jsp index e7f335ad5..137ccce06 100644 --- a/apps/showcase/src/main/webapp/token/doublePost.jsp +++ b/apps/showcase/src/main/webapp/token/doublePost.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> @@ -9,7 +9,7 @@

- Click here to return. + Click here to return. diff --git a/apps/showcase/src/main/webapp/token/example1.jsp b/apps/showcase/src/main/webapp/token/example1.jsp index 5ff4416f7..efbee487a 100644 --- a/apps/showcase/src/main/webapp/token/example1.jsp +++ b/apps/showcase/src/main/webapp/token/example1.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Token Examples @@ -10,15 +10,15 @@ happens once.

-
Balance of source account: -
Balance of destination account: +
Balance of source account: +
Balance of destination account:

- - - - - + + + + + diff --git a/apps/showcase/src/main/webapp/token/example2.jsp b/apps/showcase/src/main/webapp/token/example2.jsp index fbe71d2ae..46d39a4f9 100644 --- a/apps/showcase/src/main/webapp/token/example2.jsp +++ b/apps/showcase/src/main/webapp/token/example2.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Token Examples @@ -10,15 +10,15 @@ happens once. This action will redirect after you have submitted the form.

-
Balance of source account: -
Balance of destination account: +
Balance of source account: +
Balance of destination account:

- - - - - + + + + + diff --git a/apps/showcase/src/main/webapp/token/example3.jsp b/apps/showcase/src/main/webapp/token/example3.jsp index 0d30e08ec..24418ece3 100644 --- a/apps/showcase/src/main/webapp/token/example3.jsp +++ b/apps/showcase/src/main/webapp/token/example3.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Token Examples @@ -10,15 +10,15 @@ happens once. This example uses the token session based interceptor and redirect after post.

-
Balance of source account: -
Balance of destination account: +
Balance of source account: +
Balance of destination account:

- - - - - + + + + + diff --git a/apps/showcase/src/main/webapp/token/index.jsp b/apps/showcase/src/main/webapp/token/index.jsp index 32739e6e6..947315996 100644 --- a/apps/showcase/src/main/webapp/token/index.jsp +++ b/apps/showcase/src/main/webapp/token/index.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Token Examples (double post) diff --git a/apps/showcase/src/main/webapp/token/transferDone.jsp b/apps/showcase/src/main/webapp/token/transferDone.jsp index a81c7ed32..d741d9411 100644 --- a/apps/showcase/src/main/webapp/token/transferDone.jsp +++ b/apps/showcase/src/main/webapp/token/transferDone.jsp @@ -1,14 +1,14 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Token Examples (double post)

Token Examples

- The transfer is done at + The transfer is done at -
New balance of source account: -
New balance of destination account: +
New balance of source account: +
New balance of destination account:

Try using the browser back button and submit the form again. This should result in a double post @@ -19,7 +19,7 @@ web page result from the first post.

- Click here to return. + Click here to return. diff --git a/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp b/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp index 8852cc3ab..6c6bf5664 100644 --- a/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp +++ b/apps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp @@ -5,51 +5,51 @@ @version $Date: 2006/01/13 16:23:41 $ $Id: clientSideValidationExample.jsp,v 1.1 2006/01/13 16:23:41 rainerh Exp $ --%> -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> - - Showcase - Validation - Field Validators Example - - - - - + + Showcase - Validation - Field Validators Example + + + + + - + -

All Field Errors Will Appear Here

- -
+

All Field Errors Will Appear Here

+ +
-

Field Error due to 'Required String Validator Field' Will Appear Here

- - - -
+

Field Error due to 'Required String Validator Field' Will Appear Here

+ + + +
-

Field Error due to 'String Length Validator Field' Will Appear Here

- - stringLengthValidatorField - -
+

Field Error due to 'String Length Validator Field' Will Appear Here

+ + stringLengthValidatorField + +
- - - - - - - - - - - - + + + + + + + + + + + + - - + + diff --git a/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp index c0d9627a8..0738ebfa8 100644 --- a/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp @@ -5,51 +5,51 @@ @version $Date: 2006/01/13 16:23:43 $ $Id: fieldValidatorsExample.jsp,v 1.4 2006/01/13 16:23:43 rainerh Exp $ --%> -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> - - Showcase - Validation - Field Validators Example - - - - - - - - -

All Field Errors Will Appear Here

- -
- -

Field Error due to 'Required String Validator Field' Will Appear Here

- - - -
- -

Field Error due to 'String Length Validator Field' Will Appear Here

- - stringLengthValidatorField - -
- - - - - - - - - - - - - - + + Showcase - Validation - Field Validators Example + + + + + + + + +

All Field Errors Will Appear Here

+ +
+ +

Field Error due to 'Required String Validator Field' Will Appear Here

+ + + +
+ +

Field Error due to 'String Length Validator Field' Will Appear Here

+ + stringLengthValidatorField + +
+ + + + + + + + + + + + + + - - - - + + + + diff --git a/apps/showcase/src/main/webapp/validation/footer.jsp b/apps/showcase/src/main/webapp/validation/footer.jsp index 51bcb5fc7..8042922c2 100644 --- a/apps/showcase/src/main/webapp/validation/footer.jsp +++ b/apps/showcase/src/main/webapp/validation/footer.jsp @@ -1,9 +1,9 @@ -<%@taglib uri="/struts-action" prefix="saf" %> + <%@taglib prefix="s" uri="/tags" %>
- - - -Back To Validation Examples  -Back To Showcase + + + +Back To Validation Examples  +Back To Showcase diff --git a/apps/showcase/src/main/webapp/validation/index.jsp b/apps/showcase/src/main/webapp/validation/index.jsp index d6b53786a..ece2ab7b7 100644 --- a/apps/showcase/src/main/webapp/validation/index.jsp +++ b/apps/showcase/src/main/webapp/validation/index.jsp @@ -1,40 +1,40 @@ <%-- - index.jsp + index.jsp - @author tm_jee - @version $Date: 2006/01/13 16:23:44 $ $Id: index.jsp,v 1.4 2006/01/13 16:23:44 rainerh Exp $ + @author tm_jee + @version $Date: 2006/01/13 16:23:44 $ $Id: index.jsp,v 1.4 2006/01/13 16:23:44 rainerh Exp $ --%> -<%@taglib uri="/struts-action" prefix="saf" %> +<%@taglib prefix="s" uri="/tags" %> - - Showcase - Validation - - -

Validation Examples

- - - - - - - - - - - -
    -
  • Validation (basic)
    • -
  • Validation (client)
    • -
  • Validation (client using css_xhtml theme)
    • -
  • Validation (ajax)
    • -
  • Field Validators
    • -
  • Non Field Validator
    • -
  • Visitor Validator
    • -
  • Client side validation using JavaScript
    • -
  • Back To Showcase -
- + + Showcase - Validation + + +

Validation Examples

+ + + + + + + + + + + +
    +
  • Validation (basic)
    • +
  • Validation (client)
    • +
  • Validation (client using css_xhtml theme)
    • +
  • Validation (ajax)
    • +
  • Field Validators
    • +
  • Non Field Validator
    • +
  • Visitor Validator
    • +
  • Client side validation using JavaScript
    • +
  • Back To Showcase +
+ diff --git a/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp index c661c5e57..941d12e79 100644 --- a/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp @@ -1,38 +1,38 @@ <%-- - nonFieldValidatorsExample.jsp - - @author tm_jee - @version $Date: 2005/12/24 09:22:28 $ $Id: nonFieldValidatorsExample.jsp,v 1.3 2005/12/24 09:22:28 tmjee Exp $ + nonFieldValidatorsExample.jsp + + @author tm_jee + @version $Date: 2005/12/24 09:22:28 $ $Id: nonFieldValidatorsExample.jsp,v 1.3 2005/12/24 09:22:28 tmjee Exp $ --%> -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> - - Showcase - Validation - Non Field Validator Example - - - - - - - - - - - - - - - - - - - - - - - + + Showcase - Validation - Non Field Validator Example + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp b/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp index 1fdc4b442..245356f4d 100644 --- a/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp +++ b/apps/showcase/src/main/webapp/validation/quiz-ajax.jsp @@ -1,21 +1,21 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Validation - Basic - + - - - - - - + + + + + + diff --git a/apps/showcase/src/main/webapp/validation/quiz-basic.jsp b/apps/showcase/src/main/webapp/validation/quiz-basic.jsp index f2bbfabd3..25a2f59f8 100644 --- a/apps/showcase/src/main/webapp/validation/quiz-basic.jsp +++ b/apps/showcase/src/main/webapp/validation/quiz-basic.jsp @@ -1,11 +1,11 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Validation - Basic - + @@ -13,12 +13,12 @@ What is your favorite color?

- - - - - - + + + + + + diff --git a/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp b/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp index b23404695..11c293c47 100644 --- a/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp +++ b/apps/showcase/src/main/webapp/validation/quiz-client-css.jsp @@ -1,21 +1,21 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Validation - Basic - + - - - - - - + + + + + + diff --git a/apps/showcase/src/main/webapp/validation/quiz-client.jsp b/apps/showcase/src/main/webapp/validation/quiz-client.jsp index 3bafc07a2..bb261d603 100644 --- a/apps/showcase/src/main/webapp/validation/quiz-client.jsp +++ b/apps/showcase/src/main/webapp/validation/quiz-client.jsp @@ -1,21 +1,21 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Validation - Basic - + - - - - - - + + + + + + diff --git a/apps/showcase/src/main/webapp/validation/quiz-success.jsp b/apps/showcase/src/main/webapp/validation/quiz-success.jsp index e5e371421..c00c19143 100644 --- a/apps/showcase/src/main/webapp/validation/quiz-success.jsp +++ b/apps/showcase/src/main/webapp/validation/quiz-success.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Quiz submitted! @@ -6,9 +6,9 @@ -Thank you, . Your answer has been submitted as: +Thank you, . Your answer has been submitted as: - + diff --git a/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp b/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp index d92f3cd6a..eb622420f 100644 --- a/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp +++ b/apps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp @@ -1,53 +1,53 @@ <%-- - successFieldValidatorsExample.jsp + successFieldValidatorsExample.jsp - @author tm_jee - @version $Date: 2006/01/13 16:23:45 $ $Id: successClientSideValidationExample.jsp,v 1.1 2006/01/13 16:23:45 rainerh Exp $ + @author tm_jee + @version $Date: 2006/01/13 16:23:45 $ $Id: successClientSideValidationExample.jsp,v 1.1 2006/01/13 16:23:45 rainerh Exp $ --%> -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> - Showcase - Validation - SuccessFieldValidatorsExample - -

Success !

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Required Validator Field:
Required String Validator Field:
Integer Validator Field:
Date Validator Field:
Email Validator Field:
URL Validator Field:
String Length Validator Field:
Regex Validator Field: Field Expression Validator Field:
+ Showcase - Validation - SuccessFieldValidatorsExample + +

Success !

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Required Validator Field:
Required String Validator Field:
Integer Validator Field:
Date Validator Field:
Email Validator Field:
URL Validator Field:
String Length Validator Field:
Regex Validator Field: Field Expression Validator Field:
- - - + + + diff --git a/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp index ae073e465..fe56ce533 100644 --- a/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp @@ -1,48 +1,48 @@ <%-- - successFieldValidatorsExample.jsp - - @author tm_jee - @version $Date: 2005/12/22 09:17:59 $ $Id: successFieldValidatorsExample.jsp,v 1.1 2005/12/22 09:17:59 tmjee Exp $ + successFieldValidatorsExample.jsp + + @author tm_jee + @version $Date: 2005/12/22 09:17:59 $ $Id: successFieldValidatorsExample.jsp,v 1.1 2005/12/22 09:17:59 tmjee Exp $ --%> -<%@taglib prefix="saf" uri="/struts-action" %> +<%@taglib prefix="s" uri="/tags" %> - Showcase - Validation - SuccessFieldValidatorsExample - -

Success !

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Required Validator Field:
Required String Validator Field:
Integer Validator Field:
Date Validator Field:
Email Validator Field:
String Length Validator Field:
Regex Validator Field: Field Expression Validator Field:
- - - + Showcase - Validation - SuccessFieldValidatorsExample + +

Success !

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Required Validator Field:
Required String Validator Field:
Integer Validator Field:
Date Validator Field:
Email Validator Field:
String Length Validator Field:
Regex Validator Field: Field Expression Validator Field:
+ + + diff --git a/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp index dfd9a98b4..7ed2bdacb 100644 --- a/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp @@ -1,33 +1,33 @@ <%-- - successNonFieldValidatorsExample.jsp - - @author tm_jee - @version $Date: 2005/12/22 09:17:59 $ $Id: successNonFieldValidatorsExample.jsp,v 1.1 2005/12/22 09:17:59 tmjee Exp $ + successNonFieldValidatorsExample.jsp + + @author tm_jee + @version $Date: 2005/12/22 09:17:59 $ $Id: successNonFieldValidatorsExample.jsp,v 1.1 2005/12/22 09:17:59 tmjee Exp $ --%> -<%@taglib uri="/struts-action" prefix="saf" %> +<%@taglib prefix="s" uri="/tags" %> - Showcase - Validation - SuccessNonFieldValidatorsExample - -

Success !

- - - - - - - - - - - - - -
Some Text:
Some Text Retyped:
Some Text Retyped Again:
- - - + Showcase - Validation - SuccessNonFieldValidatorsExample + +

Success !

+ + + + + + + + + + + + + +
Some Text:
Some Text Retyped:
Some Text Retyped Again:
+ + + diff --git a/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp index 86b590f53..f272e74ec 100644 --- a/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp @@ -1,35 +1,35 @@ <%-- - successVisitorValidatorsExample.jsp - - @author tm_jee - @version $Date: 2005/12/22 09:18:00 $ $Id: successVisitorValidatorsExample.jsp,v 1.1 2005/12/22 09:18:00 tmjee Exp $ + successVisitorValidatorsExample.jsp + + @author tm_jee + @version $Date: 2005/12/22 09:18:00 $ $Id: successVisitorValidatorsExample.jsp,v 1.1 2005/12/22 09:18:00 tmjee Exp $ --%> -<%@taglib uri="/struts-action" prefix="saf" %> +<%@taglib prefix="s" uri="/tags" %> - Showcase - Validation - SuccessVisitorValidatorsExameple - -

Success !

- - - - - - - - - - - - - -
User Name:
User Age:
User Birthday:
- - - - + Showcase - Validation - SuccessVisitorValidatorsExameple + +

Success !

+ + + + + + + + + + + + + +
User Name:
User Age:
User Birthday:
+ + + + diff --git a/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp index 61a095782..6e0b7e3ba 100644 --- a/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp @@ -1,36 +1,36 @@ <%-- - visitorValidatorsExample.jsp - - @author tm_jee - @version $Date: 2005/12/24 09:22:28 $ $Id: visitorValidatorsExample.jsp,v 1.3 2005/12/24 09:22:28 tmjee Exp $ + visitorValidatorsExample.jsp + + @author tm_jee + @version $Date: 2005/12/24 09:22:28 $ $Id: visitorValidatorsExample.jsp,v 1.3 2005/12/24 09:22:28 tmjee Exp $ --%> -<%@taglib uri="/struts-action" prefix="saf" %> +<%@taglib prefix="s" uri="/tags" %> Showcase - Validation - VisitorValidatorsExample - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/apps/showcase/src/main/webapp/wait/complete.jsp b/apps/showcase/src/main/webapp/wait/complete.jsp index 80db746df..8d2a57d43 100644 --- a/apps/showcase/src/main/webapp/wait/complete.jsp +++ b/apps/showcase/src/main/webapp/wait/complete.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Execute and Wait Examples @@ -7,7 +7,7 @@ We have processed your request.

- Click here to return. + Click here to return. diff --git a/apps/showcase/src/main/webapp/wait/example1.jsp b/apps/showcase/src/main/webapp/wait/example1.jsp index 70b8be613..6b976be11 100644 --- a/apps/showcase/src/main/webapp/wait/example1.jsp +++ b/apps/showcase/src/main/webapp/wait/example1.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Execute and Wait Examples @@ -7,10 +7,10 @@ Example 1: In the form below enter how long time to simulate the process should take. - - - - + + + + diff --git a/apps/showcase/src/main/webapp/wait/example2.jsp b/apps/showcase/src/main/webapp/wait/example2.jsp index a2eaac1da..908b1261c 100644 --- a/apps/showcase/src/main/webapp/wait/example2.jsp +++ b/apps/showcase/src/main/webapp/wait/example2.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Execute and Wait Examples @@ -8,10 +8,10 @@ Example 2: As example 1 but uses a delay of 2000 millis before the wait page is shown. Try simulating with a value of 500 millis to see that no wait page is shown at all. - - - - + + + + diff --git a/apps/showcase/src/main/webapp/wait/example3.jsp b/apps/showcase/src/main/webapp/wait/example3.jsp index 3b1ccb8ee..b2368fe41 100644 --- a/apps/showcase/src/main/webapp/wait/example3.jsp +++ b/apps/showcase/src/main/webapp/wait/example3.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Execute and Wait Examples @@ -9,10 +9,10 @@ While waiting for the wait page it will check every 1000 millis if the background process is already done. Try simulating with a value of 700 millis to see that the wait page is shown soon thereafter. - - - - + + + + diff --git a/apps/showcase/src/main/webapp/wait/index.jsp b/apps/showcase/src/main/webapp/wait/index.jsp index ca63d79a8..212b25365 100644 --- a/apps/showcase/src/main/webapp/wait/index.jsp +++ b/apps/showcase/src/main/webapp/wait/index.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> Execute and Wait Examples diff --git a/apps/showcase/src/main/webapp/wait/wait.jsp b/apps/showcase/src/main/webapp/wait/wait.jsp index 5cdc3e6f7..3f901d6ee 100644 --- a/apps/showcase/src/main/webapp/wait/wait.jsp +++ b/apps/showcase/src/main/webapp/wait/wait.jsp @@ -1,7 +1,7 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> - "/> + "/> @@ -10,7 +10,7 @@

- You can click this link to ">refresh. + You can click this link to ">refresh. diff --git a/apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp b/apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp index 5b60a0b48..a445fd41e 100644 --- a/apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp +++ b/apps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> @@ -10,10 +10,10 @@

Matrix Form - - - - + + + +

diff --git a/apps/starter/src/main/webapp/WEB-INF/pages/home.jsp b/apps/starter/src/main/webapp/WEB-INF/pages/home.jsp index 47e00f0d4..58c1105db 100644 --- a/apps/starter/src/main/webapp/WEB-INF/pages/home.jsp +++ b/apps/starter/src/main/webapp/WEB-INF/pages/home.jsp @@ -1,4 +1,4 @@ -<%@ taglib prefix="saf" uri="/struts-action" %> +<%@ taglib prefix="s" uri="/tags" %> @@ -11,8 +11,8 @@
Example action

- - Enter the matrix + + Enter the matrix

diff --git a/apps/starter/src/main/webapp/WEB-INF/web.xml b/apps/starter/src/main/webapp/WEB-INF/web.xml index e10449895..0365fb5e7 100644 --- a/apps/starter/src/main/webapp/WEB-INF/web.xml +++ b/apps/starter/src/main/webapp/WEB-INF/web.xml @@ -14,7 +14,7 @@ action2 /* - + org.springframework.web.context.ContextLoaderListener @@ -39,12 +39,12 @@ diff --git a/build.xml b/build.xml index 121ab144f..e0ad0b530 100644 --- a/build.xml +++ b/build.xml @@ -77,9 +77,9 @@ - + - + @@ -123,8 +123,8 @@ - - + + @@ -164,7 +164,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/core/src/main/etc/README.txt b/core/src/main/etc/README.txt index c2fdea4be..644590460 100644 --- a/core/src/main/etc/README.txt +++ b/core/src/main/etc/README.txt @@ -60,13 +60,13 @@ simply run "ant jar" to create your own version of Struts. === Distribution jars === -The distribution zip file contains in the main dir the Struts jar, named struts-action-.jar. +The distribution zip file contains in the main dir the Struts jar, named struts-core-.jar. You can also find in the dist subdirectory a different Struts packaging: -- struts-action-nostatic-.jar: containing only Struts without the static content -- struts-action-static-.zip: containing the required Struts static dependencies +- struts-core-nostatic-.jar: containing only Struts without the static content +- struts-core-static-.zip: containing the required Struts static dependencies -The struts-action-static-.zip content must be included in the war distribution under struts directory, +The struts-core-static-.zip content must be included in the war distribution under struts directory, or a directory mapped to the URL /struts. You must also set in your webapp struts.properties the struts.serve.static property to false. diff --git a/core/src/main/etc/taglib-settings.xml b/core/src/main/etc/taglib-settings.xml index af3549ccb..cd2bd2e95 100644 --- a/core/src/main/etc/taglib-settings.xml +++ b/core/src/main/etc/taglib-settings.xml @@ -1,5 +1,5 @@ 1.1 1.2 - struts-action - /struts-action + struts-tags + /tags A tag library for processing Model-2 command results diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index c3f2d8c5c..ad54f0c26 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -122,7 +122,7 @@ public class Component { public boolean end(Writer writer, String body) { return end(writer, body, true); } - + /** * Callback for the start tag of this component. * Should the body be evaluated again? @@ -164,7 +164,7 @@ public class Component { int currPosition = componentStack.search(this); if (currPosition >= 0) { int start = componentStack.size() - currPosition - 1; - + //for (int i = componentStack.size() - 2; i >= 0; i--) { for (int i = start; i >=0; i--) { Component component = (Component) componentStack.get(i); @@ -225,7 +225,7 @@ public class Component { * Finds a value from the OGNL stack based on the given expression. * Will always evaluate expr against stack except when expr * is null. If altsyntax (%{...}) is applied, simply strip it off. - * + * * @param expr the expression. Returns null if expr is null. * @return the value, null if not found. */ @@ -245,11 +245,9 @@ public class Component { } /** - * Is the altSyntax enabled? + * Is the altSyntax enabled? [TRUE] *

* See struts.properties where the altSyntax flag is defined. - * Note: Since WebWork 2.17 the altSyntax is default true. - * @return true if the altSyntax is enabled. */ public boolean altSyntax() { return ContextUtil.isUseAltSyntax(stack.getContext()); @@ -258,9 +256,9 @@ public class Component { /** * Evaluates the OGNL stack to find an Object value. *

- * Function just like findValue(String) except that if the - * given expression is null a error is logged and - * a RuntimeException is thrown constructed with a + * Function just like findValue(String) except that if the + * given expression is null a error is logged and + * a RuntimeException is thrown constructed with a * messaged based on the given field and errorMsg paramter. * * @param expr OGNL expression. @@ -291,7 +289,7 @@ public class Component { /** * Evaluates the OGNL stack to find an Object of the given type. Will evaluate - * expr the portion wrapped with altSyntax (%{...}) + * expr the portion wrapped with altSyntax (%{...}) * against stack when altSyntax is on, else the whole expr * is evaluated against the stack. *

@@ -339,7 +337,7 @@ public class Component { String uri = mapper.getUriFromActionMapping(mapping); return UrlHelper.buildUrl(uri, req, res, parameters, scheme, includeContext, encodeResult); } - + /** * Renders an action URL by consulting the {@link org.apache.struts2.dispatcher.mapper.ActionMapper}. * @param action the action @@ -352,10 +350,10 @@ public class Component { * @param encodeResult should the url be encoded * @return the action url. */ - protected String determineActionURL(String action, String namespace, + protected String determineActionURL(String action, String namespace, HttpServletRequest req, HttpServletResponse res, Map parameters, String scheme, boolean includeContext, boolean encodeResult) { - return determineActionURL(action, namespace, null, req, res, parameters, + return determineActionURL(action, namespace, null, req, res, parameters, scheme, includeContext, encodeResult); } diff --git a/core/src/main/java/org/apache/struts2/components/DatePicker.java b/core/src/main/java/org/apache/struts2/components/DatePicker.java index 7a3428ef5..09fc1c830 100644 --- a/core/src/main/java/org/apache/struts2/components/DatePicker.java +++ b/core/src/main/java/org/apache/struts2/components/DatePicker.java @@ -29,12 +29,7 @@ import java.util.Locale; * * Renders datepicker element.

* - * Implementation was changed in WebWork 2.2 to use jscalendar - * instead of non locale aware tigracalendar. Check locale and format settings if you used the old widget in your - * applications. Be sure to include proper stylesheet as described below if you don't want the calender widget to look - * transparent.

- * - * Important: Be sure to set the id attributs if not used within a <a:form /> tag, as it takes care of + * Important: Be sure to set the id attributes if not used within a <a:form /> tag, as it takes care of * setting the id for you, being required to copy selected date to text input element.

* * Following a reference for the format parameter (copied from jscalendar documentation): diff --git a/core/src/main/java/org/apache/struts2/components/OptGroup.java b/core/src/main/java/org/apache/struts2/components/OptGroup.java index 501323320..ea7b5abc4 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -31,26 +31,26 @@ import com.opensymphony.xwork2.util.OgnlValueStack; /** * - * + * * Create a optgroup component which needs to resides within a select tag. - * + * * - * - *

- * - * - * - * This component is to be used within a Select component. - * - * - * + * *

* - * 

 
+ * 
+ *
+ * This component is to be used within a  Select component.
+ *
+ * 
+ *
+ * 

+ *
+ * 
  * 
- * 
- * <ww:select label="My Selection" 
- *            name="mySelection" 
+ *
+ * <ww:select label="My Selection"
+ *            name="mySelection"
  *            value="%{'POPEYE'}"
  *            list="%{#{'SUPERMAN':'Superman', 'SPIDERMAN':'spiderman'}}">
  *    <ww:optgroup label="Adult"
@@ -58,22 +58,22 @@ import com.opensymphony.xwork2.util.OgnlValueStack;
  *    <ww:optgroup label="Japanese"
  *                 list="%{#{'POKEMON':'pokemon','DIGIMON':'digimon','SAILORMOON':'Sailormoon'}}" />
  * </ww:select>
- * 
+ *
  * 
  * 

- * 
- * @a2.tag name="optgroup" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.OptGroupTag"
+ *
+ * @a2.tag name="optgroup" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.OptGroupTag"
  * description="Renders a Select Tag's OptGroup Tag"
  */
 public class OptGroup extends Component {
-	
+
 	public static final String INTERNAL_LIST_UI_BEAN_LIST_PARAMETER_KEY = "optGroupInternalListUiBeanList";
-	
+
 	private static Log _log = LogFactory.getLog(OptGroup.class);
-	
+
 	protected HttpServletRequest req;
 	protected HttpServletResponse res;
-	
+
 	protected ListUIBean internalUiBean;
 
 	public OptGroup(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
@@ -86,27 +86,27 @@ public class OptGroup extends Component {
 			}
 		};
 	}
-	
+
 	public boolean end(Writer writer, String body) {
 		Select select = (Select) findAncestor(Select.class);
 		if (select == null) {
-			_log.error("incorrect use of OptGroup component, this component must be used within a Select component", 
+			_log.error("incorrect use of OptGroup component, this component must be used within a Select component",
 					new IllegalStateException("incorrect use of OptGroup component, this component must be used within a Select component"));
 			return false;
 		}
 		internalUiBean.start(writer);
 		internalUiBean.end(writer, body);
-		
+
 		List listUiBeans = (List) select.getParameters().get(INTERNAL_LIST_UI_BEAN_LIST_PARAMETER_KEY);
 		if (listUiBeans == null) {
 			listUiBeans = new ArrayList();
 		}
 		listUiBeans.add(internalUiBean);
 		select.addParameter(INTERNAL_LIST_UI_BEAN_LIST_PARAMETER_KEY, listUiBeans);
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Set the label attribute.
 	 * @a2.tagattribute required="false"
@@ -114,7 +114,7 @@ public class OptGroup extends Component {
 	public void setLabel(String label) {
 		internalUiBean.setLabel(label);
 	}
-	
+
 	/**
 	 * Set the disable attribute.
 	 * @a2.tagattribute required="false"
@@ -122,7 +122,7 @@ public class OptGroup extends Component {
 	public void setDisabled(String disabled) {
 		internalUiBean.setDisabled(disabled);
 	}
-	
+
 	/**
 	 * Set the list attribute.
 	 * @a2.tagattribute required="false"
@@ -130,7 +130,7 @@ public class OptGroup extends Component {
 	public void setList(String list) {
 		internalUiBean.setList(list);
 	}
-	
+
 	/**
 	 * Set the listKey attribute.
 	 * @a2.tagattribute required="false"
@@ -138,7 +138,7 @@ public class OptGroup extends Component {
 	public void setListKey(String listKey) {
 		internalUiBean.setListKey(listKey);
 	}
-	
+
 	/**
 	 * Set the listValue attribute.
 	 * @a2.tagattribute required="false"
diff --git a/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java b/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
index ef37ce126..824cab24a 100644
--- a/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
+++ b/core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
@@ -33,9 +33,9 @@ import java.util.List;
 /**
  */
 public class MultiWebApplicationContext extends WebApplicationContext {
-	
+
 	private static final long serialVersionUID = -4732081314967099271L;
-	
+
 	private List pathPriority;
     private Map paths;
     private Class resolver;
@@ -85,12 +85,12 @@ public class MultiWebApplicationContext extends WebApplicationContext {
 
         // still haven't found what we're looking for?
         // Alright, let's just hack this to work in IDEA
-        if (uriInContext.equals("/struts-action")) {
+        if (uriInContext.equals("/tags")) {
             // we do this check to support both "quickstart:showcase" and "quickstart" (using quickstart.xml)
-            if (new File("../../core/src/main/resources/META-INF/taglib.tld").exists()) {
-                return FileResource.newResource("../../core/src/main/resources/META-INF/taglib.tld");
+            if (new File("../../core/src/main/resources/META-INF/tags.tld").exists()) {
+                return FileResource.newResource("../../core/src/main/resources/META-INF/tags.tld");
             } else {
-                return FileResource.newResource("src/main/resources/META-INF/taglib.tld");
+                return FileResource.newResource("src/main/resources/META-INF/tags.tld");
             }
         }
 
diff --git a/core/src/main/java/org/apache/struts2/util/MakeIterator.java b/core/src/main/java/org/apache/struts2/util/MakeIterator.java
index 68879a32e..1f0c54d9f 100644
--- a/core/src/main/java/org/apache/struts2/util/MakeIterator.java
+++ b/core/src/main/java/org/apache/struts2/util/MakeIterator.java
@@ -23,8 +23,6 @@ import java.util.*;
 
 /**
  * MakeIterator.
- * 

- * Taken from WebWork 1.x by:
  *
  */
 public class MakeIterator {
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index a49b6e126..c0c7dc63c 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -53,7 +53,7 @@ import java.util.Properties;
 
 /**
  * Static Configuration Manager for the FreemarkerResult's configuration
- * 
+ *
  * 

  *
  * Possible extension points are :-
@@ -78,13 +78,13 @@ import java.util.Properties;
  * 
    
  *   
  1. path defined in ServletContext init parameter named 'templatePath' or 'TemplatePath' (must be an absolute path)
    2. 
  *   
  2. webapp classpath
    3. 
- *   
  3. struts's static folder (under [WEBWORK_SOURCE]/org/apache/struts2/static/
    4. 
+ *   
  4. struts's static folder (under [STRUT2_SOURCE]/org/apache/struts2/static/
    5. 
  * 

  * 

  *
  *  populateContext method

  * populate the created model.
- * 
+ *
  */
 public class FreemarkerManager {
 
@@ -202,8 +202,8 @@ public class FreemarkerManager {
         }
 
         model.put(KEY_REQUEST_MODEL, requestModel);
-        
-        
+
+
         // Create hash model wrapper for request parameters
         HttpRequestParametersHashModel reqParametersModel = (HttpRequestParametersHashModel) request.getAttribute(ATTR_REQUEST_PARAMETERS_MODEL);
         if (reqParametersModel == null || requestModel.getRequest() != request) {
@@ -211,7 +211,7 @@ public class FreemarkerManager {
         	request.setAttribute(ATTR_REQUEST_PARAMETERS_MODEL, reqParametersModel);
         }
         model.put(KEY_REQUEST_PARAMETER_MODEL, reqParametersModel);
-        
+
         return model;
     }
 
@@ -298,7 +298,7 @@ public class FreemarkerManager {
         configuration.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER);
 
         configuration.setObjectWrapper(getObjectWrapper());
-        
+
         if (Configuration.isSet(StrutsConstants.STRUTS_I18N_ENCODING)) {
         	configuration.setDefaultEncoding(Configuration.getString(StrutsConstants.STRUTS_I18N_ENCODING));
         }
diff --git a/core/src/main/resources/META-INF/taglib.tld b/core/src/main/resources/META-INF/taglib.tld
index 1971d8fca..d827e82cd 100644
--- a/core/src/main/resources/META-INF/taglib.tld
+++ b/core/src/main/resources/META-INF/taglib.tld
@@ -7,7 +7,7 @@
    1.2
    Struts 2 Taglib
 
-   /struts-action
+   /tags
 
    Struts 2 Taglib
    
@@ -6161,7 +6161,7 @@
    
 
       optgroup
-      com.opensymphony.webwork.views.jsp.ui.OptGroupTag
+      org.apache.struts2.views.jsp.ui.OptGroupTag
       JSP
       
 
diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties
index 75aec9096..7f0adb857 100644
--- a/core/src/main/resources/org/apache/struts2/default.properties
+++ b/core/src/main/resources/org/apache/struts2/default.properties
@@ -87,8 +87,8 @@ struts.tag.altSyntax=true
 ###                them right away.
 struts.devMode = false
 
-### when set to true, Struts will act in a manner more friendly to WebWork 2.2
-### applications.  Specifically, it allows for the "action!method" URL syntax 
+### when set to true, Struts will support some deprecated WebWork 2.2 idioms.
+### Specifically, it allows for the "action!method" URL syntax 
 ### that allows methods to be specified in the URL.  This behavior has been 
 ### deprecated in favor of explicit wildcards where needed.
 struts.compatibilityMode = false
diff --git a/core/src/main/xdt/taglib_tld.xdt b/core/src/main/xdt/tags_tld.xdt
similarity index 100%
rename from core/src/main/xdt/taglib_tld.xdt
rename to core/src/main/xdt/tags_tld.xdt
diff --git a/core/src/test/resources/template/test/checkbox.jsp b/core/src/test/resources/template/test/checkbox.jsp
index 76248a49b..16e5da3d5 100644
--- a/core/src/test/resources/template/test/checkbox.jsp
+++ b/core/src/test/resources/template/test/checkbox.jsp
@@ -1,11 +1,11 @@
-<%@ taglib prefix="saf" uri="/struts-action" %>
+<%@ taglib prefix="s" uri="/tags" %>
 
-checked="checked"
-   name=""
-   value=""
-    disabled="disabled"
-    tabindex=""
-    onchange=""
-    onclick=""
-    id=""
+checked="checked"
+   name=""
+   value=""
+    disabled="disabled"
+    tabindex=""
+    onchange=""
+    onclick=""
+    id=""
 />
diff --git a/docs/tags/DatePicker.html b/docs/tags/DatePicker.html
index 81db6fc1c..0bb43c7f0 100644
--- a/docs/tags/DatePicker.html
+++ b/docs/tags/DatePicker.html
@@ -16,7 +16,7 @@ Render datepicker
 

 
 

- Renders datepicker element.
 Implementation was changed in WebWork 2.2 to use jscalendar instead of non locale aware tigracalendar. Check locale and format settings if you used the old widget in your applications. Be sure to include proper stylesheet as described below if you don't want the calender widget to look transparent.
 Important: Be sure to set the id attributs if not used within a <a:form /> tag, as it takes care of setting the id for you, being required to copy selected date to text input element.
 Following a reference for the format parameter (copied from jscalendar documentation): 
 
%a abbreviated weekday name 
 
%A full weekday name 
 
%b abbreviated month name 
 
%B full month name 
 
%C century number 
 
%d the day of the month ( 00 .. 31 ) 
 
%e the day of the month ( 0 .. 31 ) 
 
%H hour ( 00 .. 23 ) 
 
%I hour ( 01 .. 12 ) 
 
%j day of the year ( 000 .. 366 ) 
 
%k hour ( 0 .. 23 ) 
 
%l hour ( 1 .. 12 ) 
 
%m month ( 01 .. 12 ) 
 
%M minute ( 00 .. 59 ) 
 
%n a newline character 
 
%p ``PM'' or ``AM'' 
 
%P ``pm'' or ``am'' 
 
%S second ( 00 .. 59 ) 
 
%s number of seconds since Epoch (since Jan 01 1970 00:00:00 UTC) 
 
%t a tab character 
 
%U, %W, %V the week number
 
%u the day of the week ( 1 .. 7, 1 = MON )
 
%w the day of the week ( 0 .. 6, 0 = SUN )
 
%y year without the century ( 00 .. 99 )
 
%Y year including the century ( ex. 1979 )
 
%% a literal % character 
  
 Examples 
  Date in application's locale format: <a:datepicker name="order.date" id="order.date" /> Date in german locale, with german texts: <a:datepicker name="delivery.date" id="delivery.date" template="datepicker_js.ftl" language="de" /> Date in german locale, with german texts and custom date format, including time: <a:datepicker name="invoice.date" id="invoice.date" template="datepicker_js.ftl" language="de" format="%d. %b &Y %H:%M" showstime="true" />  
 
  If you use this jscalendar based datepicker widget, you might want to use one of the standard stylesheets provided with jscalendar (all distribution stylesheets are included in struts jar). The easiest way to do so is to place the <a:head/> tag in the head of your html page, as it takes care of including calendar css. Otherwise, to manually activate the calendar-blue style, include the following in your stylesheet definition:  
  <link href="<a:url value="/struts/jscalendar/calendar-blue.css" />" rel="stylesheet" type="text/css" media="all"/>  

+ Renders datepicker element.
 Check locale and format settings if you used the old widget in your applications. Be sure to include proper stylesheet as described below if you don't want the calender widget to look transparent.
 Important: Be sure to set the id attributs if not used within a <a:form /> tag, as it takes care of setting the id for you, being required to copy selected date to text input element.
 Following a reference for the format parameter (copied from jscalendar documentation): 
 
%a abbreviated weekday name 
 
%A full weekday name 
 
%b abbreviated month name 
 
%B full month name 
 
%C century number 
 
%d the day of the month ( 00 .. 31 ) 
 
%e the day of the month ( 0 .. 31 ) 
 
%H hour ( 00 .. 23 ) 
 
%I hour ( 01 .. 12 ) 
 
%j day of the year ( 000 .. 366 ) 
 
%k hour ( 0 .. 23 ) 
 
%l hour ( 1 .. 12 ) 
 
%m month ( 01 .. 12 ) 
 
%M minute ( 00 .. 59 ) 
 
%n a newline character 
 
%p ``PM'' or ``AM'' 
 
%P ``pm'' or ``am'' 
 
%S second ( 00 .. 59 ) 
 
%s number of seconds since Epoch (since Jan 01 1970 00:00:00 UTC) 
 
%t a tab character 
 
%U, %W, %V the week number
 
%u the day of the week ( 1 .. 7, 1 = MON )
 
%w the day of the week ( 0 .. 6, 0 = SUN )
 
%y year without the century ( 00 .. 99 )
 
%Y year including the century ( ex. 1979 )
 
%% a literal % character 
  
 Examples 
  Date in application's locale format: <a:datepicker name="order.date" id="order.date" /> Date in german locale, with german texts: <a:datepicker name="delivery.date" id="delivery.date" template="datepicker_js.ftl" language="de" /> Date in german locale, with german texts and custom date format, including time: <a:datepicker name="invoice.date" id="invoice.date" template="datepicker_js.ftl" language="de" format="%d. %b &Y %H:%M" showstime="true" />  
 
  If you use this jscalendar based datepicker widget, you might want to use one of the standard stylesheets provided with jscalendar (all distribution stylesheets are included in struts jar). The easiest way to do so is to place the <a:head/> tag in the head of your html page, as it takes care of including calendar css. Otherwise, to manually activate the calendar-blue style, include the following in your stylesheet definition:  
  <link href="<a:url value="/struts/jscalendar/calendar-blue.css" />" rel="stylesheet" type="text/css" media="all"/>  

 

 
 
Attributes

diff --git a/src/site/site.xml b/src/site/site.xml
index eae15ea86..2daee8de8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -27,9 +27,33 @@
         
 
         
+        
+                    
+                    
+
+                    
+
+                    
+
+                    
                     
             
 
-        

+        

             
 
-            

-                Struts 2 is a Java web-application development framework.
-        It is built specifically with developer productivity and
-        code simplicity in mind, providing robust support for building
-        reusable UI templates, such as form controls, UI themes,
-        internationalization, dynamic form parameter mapping to JavaBeans,
-        robust client and server side validation, and much more.
-            

+        

+        Apache Struts 2 is a flexible control layer based on standard
+        technologies like Java Filters, JavaBeans, ResourceBundles, Locales,
+        and XML, as well as various 
+        
+          OpenSymphony
+        packages, like OGNL and XWork. The framework helps you create an
+        extensible development environment for your application, based on
+        industry standards and proven design patterns.
+        

 
+        

+        For more About Struts 2 see
+        
+          Getting Started.
+        
+