From 7872fa80f957a3af72e760682c88a7283305f531 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Wed, 23 Nov 2016 11:59:32 +0100
Subject: [PATCH] WW-4719 Moves DefaultClassFinder implementation into
 Convention and ASM dependencies

---
 core/pom.xml                                           |  8 --------
 plugins/convention/pom.xml                             | 10 ++++++++++
 .../apache/struts2/convention}/DefaultClassFinder.java |  5 ++++-
 3 files changed, 14 insertions(+), 9 deletions(-)
 rename {core/src/main/java/com/opensymphony/xwork2/util/finder => plugins/convention/src/main/java/org/apache/struts2/convention}/DefaultClassFinder.java (99%)

diff --git a/core/pom.xml b/core/pom.xml
index 9c59d9158..cc2065b34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -266,14 +266,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 740934bfc..199592426 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -32,6 +32,16 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+        </dependency>
+
+        <!-- testing -->
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultClassFinder.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
rename to plugins/convention/src/main/java/org/apache/struts2/convention/DefaultClassFinder.java
index aed42a8b8..9412f7e0c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/finder/DefaultClassFinder.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultClassFinder.java
@@ -13,12 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.util.finder;
+package org.apache.struts2.convention;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.FileManager;
 import com.opensymphony.xwork2.FileManagerFactory;
 import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.util.finder.ClassFinder;
+import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
+import com.opensymphony.xwork2.util.finder.Test;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;