Author: dkulp Date: Thu Feb 16 17:59:47 2012 New Revision: 1245104 URL: http://svn.apache.org/viewvc?rev=1245104&view=rev Log: Merged revisions 1245090 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1245090 | dkulp | 2012-02-16 12:32:31 -0500 (Thu, 16 Feb 2012) | 9 lines Merged revisions ﶓ via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1244563 | gmazza | 2012-02-15 11:12:50 -0500 (Wed, 15 Feb 2012) | 2 lines Added @Provider annotation to DataSourceProvider ........ ........ 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/DataSourceProvider.java 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/DataSourceProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java?rev=1245104&r1=1245103&r2=1245104&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java Thu Feb 16 17:59:47 2012 @@ -31,11 +31,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.ext.Provider; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.ext.multipart.InputStreamDataSource; +@Provider public class DataSourceProvider implements MessageBodyReader, MessageBodyWriter { public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mt) {
