struts-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (WW-4069) Upgrade DWR plugin to use the latest available version
Date Wed, 05 Dec 2018 07:37:00 GMT

    [ https://issues.apache.org/jira/browse/WW-4069?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16709690#comment-16709690
] 

ASF GitHub Bot commented on WW-4069:
------------------------------------

lukaszlenart closed pull request #285: WW-4069 upgrade to DWR 3 with a showcase
URL: https://github.com/apache/struts/pull/285
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml
index 96d248ff6..23d662f55 100755
--- a/apps/showcase/src/main/resources/struts-validation.xml
+++ b/apps/showcase/src/main/resources/struts-validation.xml
@@ -47,6 +47,11 @@
             <result>/WEB-INF/validation/quiz-success.jsp</result>
         </action>
 
+		<action name="quizDwr" class="org.apache.struts2.showcase.validation.QuizAction">
+			<result name="input">/WEB-INF/validation/quiz-dwr.jsp</result>
+			<result>/WEB-INF/validation/quiz-success.jsp</result>
+		</action>
+
         <action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
             <result name="input">/WEB-INF/validation/quiz-client-css.jsp</result>
             <result>/WEB-INF/validation/quiz-success.jsp</result>
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 bcbe36113..eb74c97df 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -201,6 +201,7 @@
                         <ul class="dropdown-menu" role="menu">
                             <s:url var="quizBasic" namespace="/validation" action="quizBasic"
method="input"/>
                             <s:url var="quizClient" namespace="/validation" action="quizClient"
method="input"/>
+                            <s:url var="quizDwr" namespace="/validation" action="quizDwr"
method="input"/>
                             <s:url var="quizClientCss" namespace="/validation" action="quizClientCss"
method="input"/>
                             <s:url var="fieldValidatorUrl" action="showFieldValidatorsExamples"
namespace="/validation"/>
                             <s:url var="nonFieldValidatorUrl" action="showNonFieldValidatorsExamples"
namespace="/validation"/>
@@ -216,6 +217,7 @@
                             <li><s:a href="%{storeMessageAcrossRequestExample}">Store
across request using MessageStoreInterceptor (Example)</s:a></li>
                             <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
                             <li><s:a href="%{quizClient}">Validation (client)</s:a></li>
+                            <li><s:a href="%{quizDwr}">Validation (DWR)</s:a></li>
                             <li><s:a href="%{quizClientCss}">Validation (client
using css_xhtml theme)</s:a></li>
                             <li><s:a href="%{visitorValidatorUrl}">Visitor Validator</s:a></li>
                             <li><s:a href="%{ajaxFormSubmitUrl}">AJAX Form Submit</s:a></li>
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
new file mode 100644
index 000000000..2dc69b852
--- /dev/null
+++ b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp
@@ -0,0 +1,92 @@
+<!--
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+-->
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<!-- START SNIPPET: dwrValidation -->
+
+<html>
+<head>
+	<title>Struts2 Showcase - Validation - DWR</title>
+	<s:head/>
+	<script type='text/javascript' src='../dwr/engine.js'></script>
+    <script type='text/javascript' src='../dwr/util.js'></script>
+	<script type='text/javascript' src='../dwr/interface/validator.js'></script>
+	<script type='text/javascript'>
+        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;
+        }
+	</script>
+</head>
+
+<body>
+
+<div class="page-header">
+	<h1>DWR validation Example</h1>
+</div>
+
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-12">
+
+			<s:form method="post">
+				<s:textfield label="Name" name="name"/>
+				<s:textfield label="Age" name="age"/>
+				<s:textfield label="Favorite color" name="answer"/>
+				<s:submit cssClass="btn btn-primary" onClick="return dwrFormValidation()"/>
+			</s:form>
+			<div id="validationResult" class="errorMessage"></div>
+		</div>
+	</div>
+</div>
+</body>
+</html>
+
+<!-- END SNIPPET: dwrValidation -->
+
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index a0219c7bb..efc01f7b3 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -90,7 +90,7 @@
 
     <servlet>
         <servlet-name>dwr</servlet-name>
-        <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
+        <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
         <init-param>
             <param-name>debug</param-name>
             <param-value>true</param-value>
diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
index b77b59a6b..60edf4beb 100644
--- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
@@ -32,7 +32,7 @@
 import org.apache.struts2.dispatcher.RequestMap;
 import org.apache.struts2.dispatcher.SessionMap;
 
-import uk.ltd.getahead.dwr.WebContextFactory;
+import org.directwebremoting.WebContextFactory;
 
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionProxy;
diff --git a/pom.xml b/pom.xml
index 90c017cea..2be2aae52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,7 +650,7 @@
             <dependency>
                 <groupId>org.directwebremoting</groupId>
                 <artifactId>dwr</artifactId>
-                <version>2.0.11-RELEASE</version>
+                <version>3.0.2-RELEASE</version>
             </dependency>
 
             <dependency>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> Upgrade DWR plugin to use the latest available version
> ------------------------------------------------------
>
>                 Key: WW-4069
>                 URL: https://issues.apache.org/jira/browse/WW-4069
>             Project: Struts 2
>          Issue Type: Improvement
>          Components: Plugin - DWR
>    Affects Versions: 2.3.14
>            Reporter: Lukasz Lenart
>            Priority: Minor
>             Fix For: 2.6
>
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message