From 458acb89e597b905835760255433fc4580c83dad Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 30 Aug 2018 08:52:33 +0200
Subject: [PATCH] WW-4954 Moves XWorkList out of the util package

---
 .../xwork2/conversion/impl/CollectionConverter.java            | 1 -
 .../xwork2/{util => conversion/impl}/XWorkList.java            | 3 +--
 .../xwork2/{util => conversion/impl}/XWorkListTest.java        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename xwork-core/src/main/java/com/opensymphony/xwork2/{util => conversion/impl}/XWorkList.java (98%)
 rename xwork-core/src/test/java/com/opensymphony/xwork2/{util => conversion/impl}/XWorkListTest.java (98%)

diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
index dfe403086..a7493fc21 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
@@ -3,7 +3,6 @@ package com.opensymphony.xwork2.conversion.impl;
 import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
 import com.opensymphony.xwork2.conversion.TypeConverter;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.XWorkList;
 
 import java.lang.reflect.Member;
 import java.util.Collection;
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
similarity index 98%
rename from xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
rename to xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
index 6feee75a2..f9e79b7fd 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.util;
+package com.opensymphony.xwork2.conversion.impl;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.XWorkException;
 import com.opensymphony.xwork2.conversion.TypeConverter;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
similarity index 98%
rename from xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
rename to xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
index d2aea368c..f32c066ea 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.xwork2.util;
+package com.opensymphony.xwork2.conversion.impl;
 
 import com.opensymphony.xwork2.XWorkTestCase;