Author: dkulp
Date: Thu Feb 16 17:32:31 2012
New Revision: 1245090
URL: http://svn.apache.org/viewvc?rev=1245090&view=rev
Log:
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.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
Modified:
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java?rev=1245090&r1=1245089&r2=1245090&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
Thu Feb 16 17:32:31 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) {
