Author: dkulp Date: Fri Sep 4 14:05:40 2009 New Revision: 811416 URL: http://svn.apache.org/viewvc?rev=811416&view=rev Log: Blocked revisions 811195,811406 via svnmerge
................ r811195 | dkulp | 2009-09-03 20:59:54 -0400 (Thu, 03 Sep 2009) | 10 lines Merged revisions 811149 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r811149 | dkulp | 2009-09-03 17:56:16 -0400 (Thu, 03 Sep 2009) | 2 lines [CXF-2418] Fix for stackOverlow in SchemaCollection Patch from Fried Hoeben applied ........ ................ r811406 | dkulp | 2009-09-04 09:51:11 -0400 (Fri, 04 Sep 2009) | 35 lines Blocked revisions 811177-811181,811365,811378 via svnmerge ........ r811177 | bimargulies | 2009-09-03 20:02:42 -0400 (Thu, 03 Sep 2009) | 1 line Make the Aegis type mapping work in terms of Type instead of Class so that it can keep multiple generics straight. ........ r811178 | bimargulies | 2009-09-03 20:02:53 -0400 (Thu, 03 Sep 2009) | 1 line Clarify slot in TypeClassInfo for explicit spec of the Aegis type. ........ r811179 | bimargulies | 2009-09-03 20:03:02 -0400 (Thu, 03 Sep 2009) | 1 line use Class.asSubclass to avoid a SuppressWarnings. ........ r811180 | bimargulies | 2009-09-03 20:03:14 -0400 (Thu, 03 Sep 2009) | 1 line Lots of changes in the 'Class->Type' campaign. Still fails two tests. ........ r811181 | bimargulies | 2009-09-03 20:03:27 -0400 (Thu, 03 Sep 2009) | 1 line Fix up test failures. ........ r811365 | bimargulies | 2009-09-04 08:31:44 -0400 (Fri, 04 Sep 2009) | 1 line Turn off two javascript tests until I figure out what I busted. ........ r811378 | bimargulies | 2009-09-04 09:08:20 -0400 (Fri, 04 Sep 2009) | 4 lines I keep forgetting that I wrote some tests for the Javascript stuff that are stronger than any of the Aegis tests in Aegis. Make sure that XML files can partially override actual parameterized types for maps and lists. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
