svn commit: r1509257 - /cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java

[dkulp]

Author: dkulp
Date: Thu Aug  1 14:36:47 2013
New Revision: 1509257

URL: http://svn.apache.org/r1509257
Log:
Merged revisions 1509251 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1509251 | dkulp | 2013-08-01 10:30:25 -0400 (Thu, 01 Aug 2013) | 2 lines

  [CXF-5163] Fix test failure with Java6/JAXB 2.1

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java

Modified: 
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=1509257&r1=1509256&r2=1509257&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
 Thu Aug  1 14:36:47 2013
@@ -455,8 +455,9 @@ public class JAXBEncoderDecoderTest exte
         part.setElementQName(elName);
         part.setTypeClass(OrderException.class);
             
+        //just need a simple generic context to handle the exceptions internal 
primitives
         JAXBContext exceptionContext = JAXBContext.newInstance(new Class[] {
-            OrderException.class,
+            String.class,
         });
         
JAXBEncoderDecoder.marshallException(exceptionContext.createMarshaller(), 
exception, part, elNode);