Author: sergeyb Date: Wed Feb 15 10:55:32 2012 New Revision: 1244436 URL: http://svn.apache.org/viewvc?rev=1244436&view=rev Log: Merged revisions 1244428 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1244428 | sergeyb | 2012-02-15 10:33:40 +0000 (Wed, 15 Feb 2012) | 9 lines Merged revisions 1244425 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1244425 | sergeyb | 2012-02-15 10:22:23 +0000 (Wed, 15 Feb 2012) | 1 line [CXF-3380] Enabling DataSourceProvider by default ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Feb 15 10:55:32 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1244428 +/cxf/trunk:1244425 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1244436&r1=1244435&r2=1244436&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Wed Feb 15 10:55:32 2012 @@ -74,6 +74,7 @@ public final class ProviderFactory { new SourceProvider(), new FormEncodingProvider(), new PrimitiveTextProvider(), + new DataSourceProvider(), new MultipartProvider(), new WebApplicationExceptionMapper(), new WadlGenerator());
