diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java index 63c34fc4c..2f0571728 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java @@ -46,8 +46,7 @@ public class Category { new Category(15, "Dojo"), new Category(16, "Prototype"), new Category(17, "Scriptaculous"), - new Category(18, "OpenRico"), - new Category(19, "DWR"))); + new Category(18, "OpenRico"))); } public static Category getById(long id) { diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml index de225d7e1..38e2adf83 100755 --- a/apps/showcase/src/main/resources/struts-validation.xml +++ b/apps/showcase/src/main/resources/struts-validation.xml @@ -47,12 +47,7 @@ /WEB-INF/validation/quiz-success.jsp - - /WEB-INF/validation/quiz-dwr.jsp - /WEB-INF/validation/quiz-success.jsp - - - + /WEB-INF/validation/quiz-client-css.jsp /WEB-INF/validation/quiz-success.jsp 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 77f387ace..34f732db3 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -226,7 +226,6 @@
  • Store across request using MessageStoreInterceptor (Example)
  • Validation (basic)
  • Validation (client)
  • -
  • Validation (DWR)
  • Validation (client using css_xhtml theme)
  • Visitor Validator
  • AJAX Form Submit
  • diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp deleted file mode 100644 index 51d26e781..000000000 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp +++ /dev/null @@ -1,92 +0,0 @@ - -<%@ taglib prefix="s" uri="/struts-tags" %> - - - - - - Struts2 Showcase - Validation - DWR - - - - - - var dwrValidateReply = function(data) { - var validationResult = ''; - for (index = 0; index < data.actionErrors.length; ++index) { - validationResult += (data.actionErrors[index] + '. '); - } - for (index = 0; index < data.actionMessages.length; ++index) { - validationResult += (data.actionMessages[index] + '. '); - } - if (typeof data.fieldErrors.name !== 'undefined') { - for (index = 0; index < data.fieldErrors.name.length; ++index) { - validationResult += (data.fieldErrors.name[index] + '. '); - } - } - if (typeof data.fieldErrors.age !== 'undefined') { - for (index = 0; index < data.fieldErrors.age.length; ++index) { - validationResult += (data.fieldErrors.age[index] + '. '); - } - } - if (validationResult === '') { - $('form').submit(); - } else { - dwr.util.setValue('validationResult', validationResult); - } - }; - function dwrFormValidation() { - var postData = {}; - $('form').serializeArray().map(function (x) { - postData[x.name] = x.value; - }); - validator.doPost('/validation', 'quizDwr', postData, dwrValidateReply); - return false; - } - - - - - - - -
    -
    -
    - - - - - - - -
    -
    -
    -
    - - - - -