This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-4954-struts-2-3 in repository https://gitbox.apache.org/repos/asf/struts.git
commit 458acb89e597b905835760255433fc4580c83dad Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Thu Aug 30 08:52:33 2018 +0200 WW-4954 Moves XWorkList out of the util package --- .../com/opensymphony/xwork2/conversion/impl/CollectionConverter.java | 1 - .../com/opensymphony/xwork2/{util => conversion/impl}/XWorkList.java | 3 +-- .../opensymphony/xwork2/{util => conversion/impl}/XWorkListTest.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) 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 dfe4030..a7493fc 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 6feee75..f9e79b7 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 d2aea36..f32c066 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;