Author: dkulp Date: Fri Oct 16 17:11:47 2009 New Revision: 826009 URL: http://svn.apache.org/viewvc?rev=826009&view=rev Log: Blocked revisions 825592,825733-825734 via svnmerge
................ r825592 | dkulp | 2009-10-15 13:58:03 -0400 (Thu, 15 Oct 2009) | 2 lines Fix test on 2.2 ................ r825733 | dkulp | 2009-10-15 21:37:47 -0400 (Thu, 15 Oct 2009) | 9 lines Merged revisions 825714 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r825714 | dkulp | 2009-10-15 20:36:08 -0400 (Thu, 15 Oct 2009) | 1 line [CXF-1159] Remove unneeded hack for old version of XmlSchema ........ ................ r825734 | dkulp | 2009-10-15 21:38:51 -0400 (Thu, 15 Oct 2009) | 9 lines Merged revisions 825715 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r825715 | dkulp | 2009-10-15 20:36:17 -0400 (Thu, 15 Oct 2009) | 1 line [CXF-1295] Set test to show that CXF-1295 is fixed ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java?rev=826009&r1=826008&r2=826009&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java (original) +++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java Fri Oct 16 17:11:47 2009 @@ -61,6 +61,7 @@ import org.apache.cxf.common.util.ASMHelper; import org.apache.cxf.common.util.ReflectionInvokationHandler; import org.apache.cxf.common.util.ReflectionInvokationHandler.WrapReturn; +import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.JavaUtils; import org.objectweb.asm.ClassWriter;
