From commits-return-17770-archive-asf-public=cust-asf.ponee.io@struts.apache.org Fri Mar 2 11:36:20 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 03A7518067A for ; Fri, 2 Mar 2018 11:36:19 +0100 (CET) Received: (qmail 77518 invoked by uid 500); 2 Mar 2018 10:36:18 -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 77430 invoked by uid 99); 2 Mar 2018 10:36:18 -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; Fri, 02 Mar 2018 10:36:18 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E3F7B827CC; Fri, 2 Mar 2018 09:47:40 +0000 (UTC) Date: Fri, 02 Mar 2018 09:47:41 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #210 from lukaszlenart/jackson-xml MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: yasserzamani@apache.org In-Reply-To: <151998406064.19682.622784037679312212@gitbox.apache.org> References: <151998406064.19682.622784037679312212@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 26babb6fdf385e624f187bbf3127bd56ee5f5e9c X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180302094740.E3F7B827CC@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 26babb6fdf385e624f187bbf3127bd56ee5f5e9c Merge: 6e691ff 6c5b79c Author: Yasser Zamani AuthorDate: Fri Mar 2 13:17:38 2018 +0330 Merge pull request #210 from lukaszlenart/jackson-xml WW-4922: Jackson XML apps/rest-showcase/pom.xml | 5 ++ apps/rest-showcase/src/main/resources/struts.xml | 6 ++ plugins/rest/pom.xml | 11 +++ .../struts2/rest/handler/JacksonXmlHandler.java | 61 +++++++++++++++ .../rest/handler/JacksonXmlHandlerTest.java | 87 ++++++++++++++++++++++ .../apache/struts2/rest/handler/SimpleBean.java | 46 ++++++++---- pom.xml | 9 ++- 7 files changed, 207 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact yasserzamani@apache.org.