From eaed709f1d314f02b3318667c434e5addc922154 Mon Sep 17 00:00:00 2001
From: Yasser Zamani <yasserzamani@apache.org>
Date: Sat, 25 Nov 2017 10:11:26 +0330
Subject: [PATCH] WW-4874 Refactors technology name, servlet3, to asset name,
 async

---
 plugins/{servlet3 => async}/pom.xml                         | 4 ++--
 .../main/java/org/apache/struts2}/async/AsyncAction.java    | 2 +-
 .../java/org/apache/struts2/async/DefaultAsyncManager.java} | 6 +++---
 .../src/main/resources/struts-plugin.xml                    | 2 +-
 plugins/pom.xml                                             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename plugins/{servlet3 => async}/pom.xml (94%)
 rename plugins/{servlet3/src/main/java/org/apache/struts2/servlet3 => async/src/main/java/org/apache/struts2}/async/AsyncAction.java (97%)
 rename plugins/{servlet3/src/main/java/org/apache/struts2/servlet3/async/Servlet3AsyncManager.java => async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java} (95%)
 rename plugins/{servlet3 => async}/src/main/resources/struts-plugin.xml (92%)

diff --git a/plugins/servlet3/pom.xml b/plugins/async/pom.xml
similarity index 94%
rename from plugins/servlet3/pom.xml
rename to plugins/async/pom.xml
index 36de62611..6ed07cff8 100644
--- a/plugins/servlet3/pom.xml
+++ b/plugins/async/pom.xml
@@ -27,8 +27,8 @@
         <version>2.5.14-SNAPSHOT</version>
     </parent>
 
-    <artifactId>struts2-servlet3-plugin</artifactId>
-    <name>Struts 2 Servlet3 Plugin</name>
+    <artifactId>struts2-async-plugin</artifactId>
+    <name>Struts 2 Async Plugin</name>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/plugins/servlet3/src/main/java/org/apache/struts2/servlet3/async/AsyncAction.java b/plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java
similarity index 97%
rename from plugins/servlet3/src/main/java/org/apache/struts2/servlet3/async/AsyncAction.java
rename to plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java
index 912cfe765..27729d56b 100644
--- a/plugins/servlet3/src/main/java/org/apache/struts2/servlet3/async/AsyncAction.java
+++ b/plugins/async/src/main/java/org/apache/struts2/async/AsyncAction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.servlet3.async;
+package org.apache.struts2.async;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
diff --git a/plugins/servlet3/src/main/java/org/apache/struts2/servlet3/async/Servlet3AsyncManager.java b/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java
similarity index 95%
rename from plugins/servlet3/src/main/java/org/apache/struts2/servlet3/async/Servlet3AsyncManager.java
rename to plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java
index f72f58036..4617dca3b 100644
--- a/plugins/servlet3/src/main/java/org/apache/struts2/servlet3/async/Servlet3AsyncManager.java
+++ b/plugins/async/src/main/java/org/apache/struts2/async/DefaultAsyncManager.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.servlet3.async;
+package org.apache.struts2.async;
 
 import com.opensymphony.xwork2.AsyncManager;
 import org.apache.logging.log4j.LogManager;
@@ -37,8 +37,8 @@ import java.util.concurrent.atomic.AtomicInteger;
  *
  * @since 2.5.14
  */
-public class Servlet3AsyncManager implements AsyncManager, AsyncListener {
-    private static final Logger LOG = LogManager.getLogger(Servlet3AsyncManager.class);
+public class DefaultAsyncManager implements AsyncManager, AsyncListener {
+    private static final Logger LOG = LogManager.getLogger(DefaultAsyncManager.class);
     private static final AtomicInteger threadCount = new AtomicInteger(0);
 
     private AsyncContext asyncContext;
diff --git a/plugins/servlet3/src/main/resources/struts-plugin.xml b/plugins/async/src/main/resources/struts-plugin.xml
similarity index 92%
rename from plugins/servlet3/src/main/resources/struts-plugin.xml
rename to plugins/async/src/main/resources/struts-plugin.xml
index 9c6a75208..fb71372d9 100644
--- a/plugins/servlet3/src/main/resources/struts-plugin.xml
+++ b/plugins/async/src/main/resources/struts-plugin.xml
@@ -25,5 +25,5 @@
 
 <struts>
     <bean type="com.opensymphony.xwork2.AsyncManager" name="default"
-          class="org.apache.struts2.servlet3.async.Servlet3AsyncManager" scope="prototype" />
+          class="org.apache.struts2.async.DefaultAsyncManager" scope="prototype" />
 </struts>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4a9c7647d..d94046cd7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -56,7 +56,7 @@
         <module>spring</module>
         <module>testng</module>
         <module>tiles</module>
-        <module>servlet3</module>
+        <module>async</module>
     </modules>
 
     <dependencies>