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 -->
