svn commit: r895855 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/

[dkulp]

Author: dkulp
Date: Tue Jan  5 02:16:10 2010
New Revision: 895855

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

........
  r894076 | bimargulies | 2009-12-27 11:22:50 -0500 (Sun, 27 Dec 2009) | 1 line
  
  Cleanup after previous and prepare for next test case.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java

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

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=895855&r1=895854&r2=895855&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
 Tue Jan  5 02:16:10 2010
@@ -255,7 +255,7 @@
             GenericArrayType gat = (GenericArrayType) type;
             java.lang.reflect.Type compType = gat.getGenericComponentType();
             Class<?> arrayBaseType = getTypeRelatedClass(compType);
-            // belive it or not, this seems to be the only way to get the
+            // believe it or not, this seems to be the only way to get the
             // Class object for an array of primitive type.
             Object instance = Array.newInstance(arrayBaseType, 0);
             return instance.getClass();

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java?rev=895855&r1=895854&r2=895855&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
 Tue Jan  5 02:16:10 2010
@@ -27,6 +27,8 @@
 import java.util.SortedSet;
 import java.util.Stack;
 
+import org.w3c.dom.DocumentFragment;
+
 public class CollectionService implements CollectionServiceInterface {
     
     private Map<String, Map<String, BeanWithGregorianDate>> lastComplexMap;
@@ -94,4 +96,8 @@
         return data;
     }
 
+    public Collection<DocumentFragment[]> returnCollectionOfDOMFragments() {
+        return null;
+    }
+
 }
\ No newline at end of file

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java?rev=895855&r1=895854&r2=895855&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
 Tue Jan  5 02:16:10 2010
@@ -26,6 +26,8 @@
 import java.util.SortedSet;
 import java.util.Stack;
 
+import org.w3c.dom.DocumentFragment;
+
 public interface CollectionServiceInterface {
 
     Collection<String> getStrings();
@@ -51,4 +53,6 @@
     void mapOfMapWithStringAndPojo(Map<String, Map<String, 
BeanWithGregorianDate>> bigParam); 
     
     Collection<double[]> returnCollectionOfPrimitiveArrays();
+    
+    Collection<DocumentFragment[]> returnCollectionOfDOMFragments();
 }