Return-Path: 
 <commits-return-21188-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E63AA962D
	for <apmail-cxf-commits-archive@www.apache.org>;
 Sat, 28 Jul 2012 19:23:09 +0000 (UTC)
Received: (qmail 19401 invoked by uid 500); 28 Jul 2012 19:23:09 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 19343 invoked by uid 500); 28 Jul 2012 19:23:09 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 19327 invoked by uid 99); 28 Jul 2012 19:23:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jul 2012 19:23:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jul 2012 19:23:06 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 494DB23888FD;
	Sat, 28 Jul 2012 19:22:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1366747 - in /cxf/branches/2.4.x-fixes: ./
 systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml
Date: Sat, 28 Jul 2012 19:22:22 -0000
To: commits@cxf.apache.org
From: sergeyb@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120728192222.494DB23888FD@eris.apache.org>

Author: sergeyb
Date: Sat Jul 28 19:22:21 2012
New Revision: 1366747

URL: http://svn.apache.org/viewvc?rev=1366747&view=rev
Log:
Merged revisions 1366745 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1366745 | sergeyb | 2012-07-28 20:19:48 +0100 (Sat, 28 Jul 2012) | 1 line
  
  Fix to get the test passing on 2.5.x and 2.4.x
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.5.x-fixes:r1366745

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml?rev=1366747&r1=1366746&r2=1366747&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/web.xml Sat Jul 28 19:22:21 2012
@@ -43,7 +43,7 @@
 		<init-param>
 		      <param-name>jaxrs.providers</param-name>
 		      <param-value>
-		           org.apache.cxf.jaxrs.provider.json.JSONProvider(dropRootElement=false attributesToElements=true),
+		           org.apache.cxf.jaxrs.provider.JSONProvider(dropRootElement=false attributesToElements=true),
 		           org.apache.cxf.jaxrs.provider.JAXBElementProvider
 		      </param-value>    
 		</init-param>
@@ -153,4 +153,4 @@
 		<url-pattern>/application11/*</url-pattern>
 	</servlet-mapping>
 </web-app>
-<!-- END SNIPPET: webxml -->
\ No newline at end of file
+<!-- END SNIPPET: webxml -->