From commits-return-18014-archive-asf-public=cust-asf.ponee.io@struts.apache.org Thu Aug 30 08:52:44 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C20E918067B for ; Thu, 30 Aug 2018 08:52:43 +0200 (CEST) Received: (qmail 54787 invoked by uid 500); 30 Aug 2018 06:52:42 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 54724 invoked by uid 99); 30 Aug 2018 06:52:42 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Aug 2018 06:52:42 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id F23368515B; Thu, 30 Aug 2018 06:52:41 +0000 (UTC) Date: Thu, 30 Aug 2018 06:52:42 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: WW-4954 Moves XWorkList out of the util package MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org In-Reply-To: <153561196188.25097.8616891421363210850@gitbox.apache.org> References: <153561196188.25097.8616891421363210850@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/WW-4954-struts-2-3 X-Git-Reftype: branch X-Git-Rev: 458acb89e597b905835760255433fc4580c83dad X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180830065241.F23368515B@gitbox.apache.org> 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 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;