svn commit: r1231261 - in /cxf/branches/2.5.x-fixes: ./ systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java

[dkulp]

Author: dkulp
Date: Fri Jan 13 19:29:14 2012
New Revision: 1231261

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

........
  r1229348 | dkulp | 2012-01-09 16:06:37 -0500 (Mon, 09 Jan 2012) | 1 line
  
  JAXB generated code for a couple types has rawtype issues
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
    
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 19:29:14 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229663,1229965,1230800
+/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229663,1229965,1230800

Modified: 
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java?rev=1231261&r1=1231260&r2=1231261&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
 Fri Jan 13 19:29:14 2012
@@ -2124,6 +2124,7 @@ public abstract class AbstractTypeTestCl
 
     //org.apache.type_test.types3.OccuringChoice1;
     
+    @SuppressWarnings("rawtypes")
     protected boolean equals(OccuringChoice1 x, OccuringChoice1 y) {
         List<Comparable> xList = x.getVarFloatOrVarInt();
         List<Comparable> yList = y.getVarFloatOrVarInt();
@@ -2155,6 +2156,7 @@ public abstract class AbstractTypeTestCl
             return;
         }
         OccuringChoice1 x = new OccuringChoice1();
+        @SuppressWarnings("rawtypes")
         List<Comparable> theList = x.getVarFloatOrVarInt();
         theList.add(0);
         theList.add(new Float(1.14f));

Modified: 
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java?rev=1231261&r1=1231260&r2=1231261&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
 Fri Jan 13 19:29:14 2012
@@ -840,6 +840,7 @@ public abstract class AbstractTypeTestCl
 
     //org.apache.type_test.types3.StructWithOccuringStruct;
 
+    @SuppressWarnings("rawtypes")
     protected boolean equals(StructWithOccuringStruct x, 
StructWithOccuringStruct y) {
         if (x.getVarInteger() != y.getVarInteger()) {
             return false;