You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/01/19 16:24:29 UTC
svn commit: r1233429 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Author: sergeyb
Date: Thu Jan 19 15:24:28 2012
New Revision: 1233429
URL: http://svn.apache.org/viewvc?rev=1233429&view=rev
Log:
Merged revisions 1233425 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1233425 | sergeyb | 2012-01-19 15:20:43 +0000 (Thu, 19 Jan 2012) | 1 line
Fixing another compilation failure
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 15:24:28 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1233076,1233113,1233296,1233311,1233359
+/cxf/branches/2.5.x-fixes:1233076,1233113,1233296,1233311,1233359,1233425
/cxf/trunk:1233075,1233112,1233289-1233294,1233308,1233355
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1233429&r1=1233428&r2=1233429&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Thu Jan 19 15:24:28 2012
@@ -275,7 +275,7 @@ public class JSONProviderTest extends As
@SuppressWarnings("unchecked")
@Test
public void testWriteToSingleTag2NoNs() throws Exception {
- JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
+ JSONProvider p = new JSONProvider();
p.setIgnoreNamespaces(true);
TagVO2 tag = createTag2("a", "b");