svn commit: r1176448 - in /cxf/trunk: rt/frontend/jaxrs/pom.xml systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java

[dkulp]

Author: dkulp
Date: Tue Sep 27 15:59:21 2011
New Revision: 1176448

URL: http://svn.apache.org/viewvc?rev=1176448&view=rev
Log:
Fix some issues setting up eclipse workspace due to wrong servlet jar
being picked up

Modified:
    cxf/trunk/rt/frontend/jaxrs/pom.xml
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java

Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1176448&r1=1176447&r2=1176448&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Tue Sep 27 15:59:21 2011
@@ -142,6 +142,12 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java?rev=1176448&r1=1176447&r2=1176448&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
 Tue Sep 27 15:59:21 2011
@@ -35,6 +35,7 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.systest.jaxrs.Book;
 import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
 
@@ -66,7 +67,7 @@ public class SecureBookStoreNoInterface 
     @RolesAllowed({"ROLE_USER", "ROLE_ADMIN" })
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     public Book getBookFromHttpRequestParams(@Context HttpServletRequest 
request) {
-        Map<String, String[]> params = request.getParameterMap();
+        Map<String, String[]> params = 
CastUtils.cast(request.getParameterMap());
         String name = params.get("name")[0];
         Long id = Long.valueOf(params.get("id")[0]);
         if (name == null || id == 0) {