Author: dkulp
Date: Wed Sep 28 14:26:57 2011
New Revision: 1176893
URL: http://svn.apache.org/viewvc?rev=1176893&view=rev
Log:
Merged revisions 1176448 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1176448 | dkulp | 2011-09-27 11:59:21 -0400 (Tue, 27 Sep 2011) | 2 lines
Fix some issues setting up eclipse workspace due to wrong servlet jar
being picked up
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.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/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1176893&r1=1176892&r2=1176893&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/pom.xml Wed Sep 28 14:26:57 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/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java?rev=1176893&r1=1176892&r2=1176893&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
Wed Sep 28 14:26:57 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) {
