svn commit: r1053121 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java

[sergeyb]

Author: sergeyb
Date: Mon Dec 27 18:13:14 2010
New Revision: 1053121

URL: http://svn.apache.org/viewvc?rev=1053121&view=rev
Log:
Merged revisions 1053119 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1053119 | sergeyb | 2010-12-27 18:11:09 +0000 (Mon, 27 Dec 2010) | 1 line
  
  [CXF-2626] Fixing typos in DataBindingProvider test; they do not affect the 
xmlbeans tests though
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 27 18:13:14 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996-1052997,1053114
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996-1052997,1053114,1053119

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

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java?rev=1053121&r1=1053120&r2=1053121&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataBindingProviderTest.java
 Mon Dec 27 18:13:14 2010
@@ -65,7 +65,8 @@ public class DataBindingProviderTest ext
     public void setUp() throws InvalidPropertiesFormatException, IOException {
         c = ResourceUtils.createClassResourceInfo(TheBooks.class, 
TheBooks.class, true, true);
         c2 = ResourceUtils.createClassResourceInfo(TheSDOBooks.class, 
TheSDOBooks.class, true, true);
-        c3 = ResourceUtils.createClassResourceInfo(TheSDOBooks.class, 
TheSDOBooks.class, true, true);
+        c3 = ResourceUtils.createClassResourceInfo(TheXmlBeansBooks.class, 
+                                                   TheXmlBeansBooks.class, 
true, true);
         properties = new Properties();
         
properties.loadFromXML(getClass().getResourceAsStream("jsonCases.xml"));
     }
@@ -256,7 +257,7 @@ public class DataBindingProviderTest ext
 
         @GET
         @Path("/books/{bookId}/{new}")
-        public Address getStructure() {
+        public Address getAddress() {
             return null;
         }