svn commit: r923900 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/

[sergeyb]

Author: sergeyb
Date: Tue Mar 16 17:52:04 2010
New Revision: 923900

URL: http://svn.apache.org/viewvc?rev=923900&view=rev
Log:
Merged revisions 923895 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r923895 | sergeyb | 2010-03-16 17:46:05 +0000 (Tue, 16 Mar 2010) | 1 line
  
  Mostly reverting the previous changes
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
    
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
    
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 17:52:04 2010
@@ -1 +1 @@
-/cxf/trunk:923741
+/cxf/trunk:923741,923895

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java?rev=923900&r1=923899&r2=923900&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProvider.java
 Tue Mar 16 17:52:04 2010
@@ -24,7 +24,6 @@ import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
-import javax.ws.rs.Encoded;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyReader;
@@ -32,7 +31,6 @@ import javax.ws.rs.ext.MessageBodyWriter
 
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.jaxrs.model.ParameterType;
-import org.apache.cxf.jaxrs.utils.AnnotationUtils;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
 
 public class PrimitiveTextProvider 
@@ -49,14 +47,8 @@ public class PrimitiveTextProvider 
     public Object readFrom(Class<Object> type, Type genType, Annotation[] 
anns, MediaType mt, 
                            MultivaluedMap<String, String> headers, InputStream 
is) throws IOException {
         
-        String value = IOUtils.readStringFromStream(is);
-        if (type.isAssignableFrom(String.class)) {
-            value = InjectionUtils.decodeValue(value, 
-                              AnnotationUtils.getAnnotation(anns, 
Encoded.class) == null,
-                              ParameterType.REQUEST_BODY);
-        }
         return InjectionUtils.handleParameter(
-                    value, 
+                    IOUtils.readStringFromStream(is), 
                     type,
                     ParameterType.REQUEST_BODY, null);
         

Modified: 
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java?rev=923900&r1=923899&r2=923900&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
 Tue Mar 16 17:52:04 2010
@@ -155,12 +155,6 @@ public class JAXRSMultipartTest extends 
     }
     
     @Test
-    public void testAddBookFormParam2() throws Exception {
-        String address = "http://localhost:9085/bookstore/books/formparam2";;
-        doAddBook("multipart/form-data", address, "attachmentForm", 200);      
         
-    }
-    
-    @Test
     public void testAddBookFormBody() throws Exception {
         String address = "http://localhost:9085/bookstore/books/formbody";;
         doAddBook("multipart/form-data", address, "attachmentForm", 200);      
         

Modified: 
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java?rev=923900&r1=923899&r2=923900&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
 Tue Mar 16 17:52:04 2010
@@ -162,14 +162,6 @@ public class MultipartStore {
     }
     
     @POST
-    @Path("/books/formparam2")
-    @Produces("text/xml")
-    public Response addBookFromFormParam2(@Multipart("name") String title, 
-                                          @Multipart("id") Long id) throws 
Exception {
-        return addBookFromFormParam(title, id);
-    }
-    
-    @POST
     @Path("/books/formparambean")
     @Produces("text/xml")
     public Response addBookFromFormBean(@FormParam("") Book b) throws 
Exception {