Author: sergeyb
Date: Tue Dec 7 23:29:32 2010
New Revision: 1043231
URL: http://svn.apache.org/viewvc?rev=1043231&view=rev
Log:
Merged revisions 1043229 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1043229 | sergeyb | 2010-12-07 23:24:44 +0000 (Tue, 07 Dec 2010) | 1 line
[CXF-3173] Adding JAXRSSimpleSecurityTest
........
Added:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/
- copied from r1043229,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
- copied unchanged from r1043229,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
- copied unchanged from r1043229,
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java
- copied unchanged from r1043229,
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityOutFaultInterceptor.java
- copied unchanged from r1043229,
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityOutFaultInterceptor.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties
- copied unchanged from r1043229,
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_simple_security/
- copied from r1043229,
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/
- copied from r1043229,
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/beans.xml
- copied unchanged from r1043229,
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/beans.xml
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/web.xml
- copied unchanged from r1043229,
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_simple_security/WEB-INF/web.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 7 23:29:32 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1043231&r1=1043230&r2=1043231&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Tue Dec 7 23:29:32 2010
@@ -235,6 +235,7 @@ public class JAXRSInInterceptor extends
MultivaluedMap<String, String> values,
int numberOfResources) {
message.getExchange().put(OperationResourceInfo.class, ori);
+ message.put("org.apache.cxf.resource.method", ori.getMethodToInvoke());
message.put(URITemplate.TEMPLATE_PARAMETERS, values);
String plainOperationName = ori.getMethodToInvoke().getName();
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java?rev=1043231&r1=1043230&r2=1043231&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
Tue Dec 7 23:29:32 2010
@@ -22,7 +22,6 @@ package org.apache.cxf.systest.jaxrs;
import java.net.URISyntaxException;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
@@ -80,14 +79,19 @@ public abstract class AbstractSpringServ
handlers.setHandlers(new Handler[] {webappcontext, new
DefaultHandler()});
server.setHandler(handlers);
+
try {
+ configureServer(server);
server.start();
-
} catch (Exception e) {
e.printStackTrace();
}
}
+ protected void configureServer(org.eclipse.jetty.server.Server theserver)
throws Exception {
+
+ }
+
public void tearDown() throws Exception {
super.tearDown();
if (server != null) {
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java?rev=1043231&r1=1043230&r2=1043231&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
Tue Dec 7 23:29:32 2010
@@ -98,4 +98,12 @@ public class SecureBookStoreNoInterface
public SecureBook getSecureBook() throws BookNotFoundFault {
return new SecureBook("CXF in Action", 123L);
}
+
+ @GET
+ @Path("/thebook/{bookId}")
+ @Produces("application/xml")
+ @RolesAllowed({"ROLE_BOOK_OWNER" })
+ public Book getBook(@PathParam("bookId") Long id) {
+ return books.get(id);
+ }
}
