You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/12/15 08:40:35 UTC
svn commit: r726634 [3/4] - in /cxf/trunk:
common/common/src/test/java/org/apache/cxf/helpers/
distribution/src/main/release/samples/configuration_interceptor/
distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/
dist...
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java Sun Dec 14 23:40:33 2008
@@ -1,44 +1,44 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
-
-
-
-public class BookServerSecuritySpringClass extends AbstractSpringServer {
-
- public BookServerSecuritySpringClass() {
- super("/jaxrs_security");
- }
-
- public static void main(String args[]) {
- try {
- BookServerSecuritySpringClass s = new BookServerSecuritySpringClass();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
+
+
+
+public class BookServerSecuritySpringClass extends AbstractSpringServer {
+
+ public BookServerSecuritySpringClass() {
+ super("/jaxrs_security");
+ }
+
+ public static void main(String args[]) {
+ try {
+ BookServerSecuritySpringClass s = new BookServerSecuritySpringClass();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java Sun Dec 14 23:40:33 2008
@@ -1,43 +1,43 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
-
-
-public class BookServerSecuritySpringInterface extends AbstractSpringServer {
-
- public BookServerSecuritySpringInterface() {
- super("/jaxrs_security_cglib");
- }
-
- public static void main(String args[]) {
- try {
- BookServerSecuritySpringInterface s = new BookServerSecuritySpringInterface();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
+
+
+public class BookServerSecuritySpringInterface extends AbstractSpringServer {
+
+ public BookServerSecuritySpringInterface() {
+ super("/jaxrs_security_cglib");
+ }
+
+ public static void main(String args[]) {
+ try {
+ BookServerSecuritySpringInterface s = new BookServerSecuritySpringInterface();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java Sun Dec 14 23:40:33 2008
@@ -1,44 +1,44 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
-
-
-
-public class BookServerSecuritySpringNoAnnotations extends AbstractSpringServer {
-
- public BookServerSecuritySpringNoAnnotations() {
- super("/jaxrs_security_no_annotations");
- }
-
- public static void main(String args[]) {
- try {
- BookServerSecuritySpringNoAnnotations s = new BookServerSecuritySpringNoAnnotations();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
+
+
+
+public class BookServerSecuritySpringNoAnnotations extends AbstractSpringServer {
+
+ public BookServerSecuritySpringNoAnnotations() {
+ super("/jaxrs_security_no_annotations");
+ }
+
+ public static void main(String args[]) {
+ try {
+ BookServerSecuritySpringNoAnnotations s = new BookServerSecuritySpringNoAnnotations();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java Sun Dec 14 23:40:33 2008
@@ -1,66 +1,66 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class JAXRSSpringSecurityClassTest extends AbstractSpringSecurityTest {
-
- @BeforeClass
- public static void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(BookServerSecuritySpringClass.class));
- }
-
- @Test
- public void testFailedAuthentication() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123";
- getBook(endpointAddress, "foo", "ba", 401);
- }
-
- @Test
- public void testGetBookUserAdmin() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 200);
- }
-
-
- @Test
- public void testGetBookUser() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123/123";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 200);
- }
-
- @Test
- public void testGetBookAdmin() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 403);
- }
-
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JAXRSSpringSecurityClassTest extends AbstractSpringSecurityTest {
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(BookServerSecuritySpringClass.class));
+ }
+
+ @Test
+ public void testFailedAuthentication() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123";
+ getBook(endpointAddress, "foo", "ba", 401);
+ }
+
+ @Test
+ public void testGetBookUserAdmin() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 200);
+ }
+
+
+ @Test
+ public void testGetBookUser() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123/123";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 200);
+ }
+
+ @Test
+ public void testGetBookAdmin() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 403);
+ }
+
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java Sun Dec 14 23:40:33 2008
@@ -1,65 +1,65 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class JAXRSSpringSecurityInterfaceTest extends AbstractSpringSecurityTest {
-
- @BeforeClass
- public static void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(BookServerSecuritySpringInterface.class));
- }
-
- @Test
- public void testFailedAuthentication() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123";
- getBook(endpointAddress, "foo", "ba", 401);
- }
-
- @Test
- public void testGetBookUserAdmin() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 200);
- }
-
- @Test
- public void testGetBookUser() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123/123";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 200);
- }
-
- @Test
- public void testGetBookAdmin() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 403);
- }
-
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JAXRSSpringSecurityInterfaceTest extends AbstractSpringSecurityTest {
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(BookServerSecuritySpringInterface.class));
+ }
+
+ @Test
+ public void testFailedAuthentication() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123";
+ getBook(endpointAddress, "foo", "ba", 401);
+ }
+
+ @Test
+ public void testGetBookUserAdmin() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 200);
+ }
+
+ @Test
+ public void testGetBookUser() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123/123";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 200);
+ }
+
+ @Test
+ public void testGetBookAdmin() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 403);
+ }
+
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java Sun Dec 14 23:40:33 2008
@@ -1,66 +1,66 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class JAXRSSpringSecurityNoAnnotationsTest extends AbstractSpringSecurityTest {
-
- @BeforeClass
- public static void startServers() throws Exception {
- assertTrue("server did not launch correctly",
- launchServer(BookServerSecuritySpringNoAnnotations.class));
- }
-
- @Test
- public void testFailedAuthentication() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123";
- getBook(endpointAddress, "foo", "ba", 401);
- }
-
- @Test
- public void testGetBookUserAdmin() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 200);
- }
-
-
- @Test
- public void testGetBookUser() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks/123/123";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 200);
- }
-
- @Test
- public void testGetBookAdmin() throws Exception {
- String endpointAddress =
- "http://localhost:9080/bookstorestorage/thosebooks";
- getBook(endpointAddress, "foo", "bar", 200);
- getBook(endpointAddress, "bob", "bobspassword", 403);
- }
-
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JAXRSSpringSecurityNoAnnotationsTest extends AbstractSpringSecurityTest {
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(BookServerSecuritySpringNoAnnotations.class));
+ }
+
+ @Test
+ public void testFailedAuthentication() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123";
+ getBook(endpointAddress, "foo", "ba", 401);
+ }
+
+ @Test
+ public void testGetBookUserAdmin() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 200);
+ }
+
+
+ @Test
+ public void testGetBookUser() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks/123/123";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 200);
+ }
+
+ @Test
+ public void testGetBookAdmin() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstorestorage/thosebooks";
+ getBook(endpointAddress, "foo", "bar", 200);
+ getBook(endpointAddress, "bob", "bobspassword", 403);
+ }
+
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java Sun Dec 14 23:40:33 2008
@@ -1,52 +1,52 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.apache.cxf.systest.jaxrs.Book;
-import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
-import org.springframework.security.annotation.Secured;
-
-public interface SecureBookInterface {
-
- @GET
- @Path("/thosebooks/{bookId}/")
- @Produces("application/xml")
- @Secured({"ROLE_USER", "ROLE_ADMIN" })
- Book getThatBook(@PathParam("bookId") Long id) throws BookNotFoundFault;
-
-
- @GET
- @Path("/thosebooks/{bookId}/{id}")
- @Produces("application/xml")
- @Secured("ROLE_USER")
- Book getThatBook(@PathParam("bookId") Long id, @PathParam("id") String s) throws BookNotFoundFault;
-
- @GET
- @Path("/thosebooks")
- @Produces("application/xml")
- @Secured("ROLE_ADMIN")
- Book getThatBook() throws BookNotFoundFault;
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+import org.apache.cxf.systest.jaxrs.Book;
+import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
+import org.springframework.security.annotation.Secured;
+
+public interface SecureBookInterface {
+
+ @GET
+ @Path("/thosebooks/{bookId}/")
+ @Produces("application/xml")
+ @Secured({"ROLE_USER", "ROLE_ADMIN" })
+ Book getThatBook(@PathParam("bookId") Long id) throws BookNotFoundFault;
+
+
+ @GET
+ @Path("/thosebooks/{bookId}/{id}")
+ @Produces("application/xml")
+ @Secured("ROLE_USER")
+ Book getThatBook(@PathParam("bookId") Long id, @PathParam("id") String s) throws BookNotFoundFault;
+
+ @GET
+ @Path("/thosebooks")
+ @Produces("application/xml")
+ @Secured("ROLE_ADMIN")
+ Book getThatBook() throws BookNotFoundFault;
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java Sun Dec 14 23:40:33 2008
@@ -1,55 +1,55 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.Path;
-
-import org.apache.cxf.systest.jaxrs.Book;
-import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
-
-@Path("/bookstorestorage/")
-public class SecureBookStore implements SecureBookInterface {
- private Map<Long, Book> books = new HashMap<Long, Book>();
-
- public SecureBookStore() {
- Book book = new Book();
- book.setId(123L);
- book.setName("CXF in Action");
- books.put(book.getId(), book);
- }
-
- public Book getThatBook(Long id) {
- return books.get(id);
- }
-
- public Book getThatBook(Long id, String s) {
- if (s == null) {
- throw new RuntimeException();
- }
- return books.get(id);
- }
-
- public Book getThatBook() throws BookNotFoundFault {
- return books.get(123L);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.Path;
+
+import org.apache.cxf.systest.jaxrs.Book;
+import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
+
+@Path("/bookstorestorage/")
+public class SecureBookStore implements SecureBookInterface {
+ private Map<Long, Book> books = new HashMap<Long, Book>();
+
+ public SecureBookStore() {
+ Book book = new Book();
+ book.setId(123L);
+ book.setName("CXF in Action");
+ books.put(book.getId(), book);
+ }
+
+ public Book getThatBook(Long id) {
+ return books.get(id);
+ }
+
+ public Book getThatBook(Long id, String s) {
+ if (s == null) {
+ throw new RuntimeException();
+ }
+ return books.get(id);
+ }
+
+ public Book getThatBook() throws BookNotFoundFault {
+ return books.get(123L);
+ }
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java Sun Dec 14 23:40:33 2008
@@ -1,56 +1,56 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.Path;
-
-import org.apache.cxf.systest.jaxrs.Book;
-import org.apache.cxf.systest.jaxrs.BookInterface;
-import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
-
-@Path("/bookstorestorage/")
-public class SecureBookStoreNoAnnotations implements BookInterface {
- private Map<Long, Book> books = new HashMap<Long, Book>();
-
- public SecureBookStoreNoAnnotations() {
- Book book = new Book();
- book.setId(123L);
- book.setName("CXF in Action");
- books.put(book.getId(), book);
- }
-
- public Book getThatBook(Long id) {
- return books.get(id);
- }
-
- public Book getThatBook(Long id, String s) {
- if (s == null) {
- throw new RuntimeException();
- }
- return books.get(id);
- }
-
- public Book getThatBook() throws BookNotFoundFault {
- return books.get(123L);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.Path;
+
+import org.apache.cxf.systest.jaxrs.Book;
+import org.apache.cxf.systest.jaxrs.BookInterface;
+import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
+
+@Path("/bookstorestorage/")
+public class SecureBookStoreNoAnnotations implements BookInterface {
+ private Map<Long, Book> books = new HashMap<Long, Book>();
+
+ public SecureBookStoreNoAnnotations() {
+ Book book = new Book();
+ book.setId(123L);
+ book.setName("CXF in Action");
+ books.put(book.getId(), book);
+ }
+
+ public Book getThatBook(Long id) {
+ return books.get(id);
+ }
+
+ public Book getThatBook(Long id, String s) {
+ if (s == null) {
+ throw new RuntimeException();
+ }
+ return books.get(id);
+ }
+
+ public Book getThatBook() throws BookNotFoundFault {
+ return books.get(123L);
+ }
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java Sun Dec 14 23:40:33 2008
@@ -1,71 +1,71 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.apache.cxf.systest.jaxrs.Book;
-import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
-import org.springframework.security.annotation.Secured;
-
-@Path("/bookstorestorage/")
-public class SecureBookStoreNoInterface {
- private Map<Long, Book> books = new HashMap<Long, Book>();
-
- public SecureBookStoreNoInterface() {
- Book book = new Book();
- book.setId(123L);
- book.setName("CXF in Action");
- books.put(book.getId(), book);
- }
-
- @GET
- @Path("/thosebooks/{bookId}/{id}")
- @Produces("application/xml")
- @Secured({"ROLE_USER", "ROLE_ADMIN" })
- public Book getThatBook(@PathParam("bookId") Long id, @PathParam("id") String s) {
- if (s == null) {
- throw new RuntimeException();
- }
- return books.get(id);
- }
-
- @GET
- @Path("/thosebooks/{bookId}/")
- @Produces("application/xml")
- @Secured("ROLE_USER")
- public Book getThatBook(@PathParam("bookId") Long id) {
- return books.get(id);
- }
-
- @GET
- @Path("/thosebooks")
- @Produces("application/xml")
- @Secured("ROLE_ADMIN")
- public Book getThatBook() throws BookNotFoundFault {
- return books.get(123L);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+import org.apache.cxf.systest.jaxrs.Book;
+import org.apache.cxf.systest.jaxrs.BookNotFoundFault;
+import org.springframework.security.annotation.Secured;
+
+@Path("/bookstorestorage/")
+public class SecureBookStoreNoInterface {
+ private Map<Long, Book> books = new HashMap<Long, Book>();
+
+ public SecureBookStoreNoInterface() {
+ Book book = new Book();
+ book.setId(123L);
+ book.setName("CXF in Action");
+ books.put(book.getId(), book);
+ }
+
+ @GET
+ @Path("/thosebooks/{bookId}/{id}")
+ @Produces("application/xml")
+ @Secured({"ROLE_USER", "ROLE_ADMIN" })
+ public Book getThatBook(@PathParam("bookId") Long id, @PathParam("id") String s) {
+ if (s == null) {
+ throw new RuntimeException();
+ }
+ return books.get(id);
+ }
+
+ @GET
+ @Path("/thosebooks/{bookId}/")
+ @Produces("application/xml")
+ @Secured("ROLE_USER")
+ public Book getThatBook(@PathParam("bookId") Long id) {
+ return books.get(id);
+ }
+
+ @GET
+ @Path("/thosebooks")
+ @Produces("application/xml")
+ @Secured("ROLE_ADMIN")
+ public Book getThatBook() throws BookNotFoundFault {
+ return books.get(123L);
+ }
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java Sun Dec 14 23:40:33 2008
@@ -1,33 +1,33 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.security;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-
-import org.springframework.security.AccessDeniedException;
-
-public class SecurityExceptionMapper implements ExceptionMapper<AccessDeniedException> {
-
- public Response toResponse(AccessDeniedException exception) {
- return Response.status(Response.Status.FORBIDDEN).build();
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs.security;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.springframework.security.AccessDeniedException;
+
+public class SecurityExceptionMapper implements ExceptionMapper<AccessDeniedException> {
+
+ public Response toResponse(AccessDeniedException exception) {
+ return Response.status(Response.Status.FORBIDDEN).build();
+ }
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml Sun Dec 14 23:40:33 2008
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: beans -->
-<!--beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop
-http://www.springframework.org/schema/aop/spring-aop.xsd
-http://www.springframework.org/schema/security
-http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
-http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <jaxrs:server id="bookservice"
- address="/">
- <jaxrs:serviceBeans>
- <ref bean="bookstore"/>
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
- </jaxrs:providers>
- </jaxrs:server>
-
- <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStore"/>
-
- <security:global-method-security secured-annotations="enabled"/>
-
- <security:http auto-config='true'>
- <security:http-basic />
- </security:http>
-
- <security:authentication-provider>
- <security:user-service>
- <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
- <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
- </security:user-service>
- </security:authentication-provider>
-</beans>
-<!-- END SNIPPET: beans -->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: beans -->
+<!--beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://www.springframework.org/schema/security
+http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <jaxrs:server id="bookservice"
+ address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="bookstore"/>
+ </jaxrs:serviceBeans>
+ <jaxrs:providers>
+ <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
+ </jaxrs:providers>
+ </jaxrs:server>
+
+ <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStore"/>
+
+ <security:global-method-security secured-annotations="enabled"/>
+
+ <security:http auto-config='true'>
+ <security:http-basic />
+ </security:http>
+
+ <security:authentication-provider>
+ <security:user-service>
+ <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
+ <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
+ </security:user-service>
+ </security:authentication-provider>
+</beans>
+<!-- END SNIPPET: beans -->
+
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml Sun Dec 14 23:40:33 2008
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: webxml -->
-<web-app>
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/beans.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>
- org.springframework.web.context.ContextLoaderListener
- </listener-class>
- </listener>
-
- <filter>
- <filter-name>springSecurityFilterChain</filter-name>
- <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>springSecurityFilterChain</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <display-name>CXF Servlet</display-name>
- <servlet-class>
- org.apache.cxf.transport.servlet.CXFServlet
- </servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/beans.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml Sun Dec 14 23:40:33 2008
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: beans -->
-<!--beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop
-http://www.springframework.org/schema/aop/spring-aop.xsd
-http://www.springframework.org/schema/security
-http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
-http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <jaxrs:server id="bookservice"
- address="/">
- <jaxrs:serviceBeans>
- <ref bean="bookstore"/>
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
- </jaxrs:providers>
- </jaxrs:server>
-
- <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoInterface"/>
- <aop:config proxy-target-class="true"/>
-
- <security:global-method-security secured-annotations="enabled"/>
-
- <security:http auto-config='true'>
- <security:http-basic />
- </security:http>
-
- <security:authentication-provider>
- <security:user-service>
- <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
- <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
- </security:user-service>
- </security:authentication-provider>
-</beans>
-<!-- END SNIPPET: beans -->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: beans -->
+<!--beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://www.springframework.org/schema/security
+http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <jaxrs:server id="bookservice"
+ address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="bookstore"/>
+ </jaxrs:serviceBeans>
+ <jaxrs:providers>
+ <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
+ </jaxrs:providers>
+ </jaxrs:server>
+
+ <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoInterface"/>
+ <aop:config proxy-target-class="true"/>
+
+ <security:global-method-security secured-annotations="enabled"/>
+
+ <security:http auto-config='true'>
+ <security:http-basic />
+ </security:http>
+
+ <security:authentication-provider>
+ <security:user-service>
+ <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
+ <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
+ </security:user-service>
+ </security:authentication-provider>
+</beans>
+<!-- END SNIPPET: beans -->
+
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml Sun Dec 14 23:40:33 2008
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: webxml -->
-<web-app>
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/beans.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>
- org.springframework.web.context.ContextLoaderListener
- </listener-class>
- </listener>
-
- <filter>
- <filter-name>springSecurityFilterChain</filter-name>
- <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>springSecurityFilterChain</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <display-name>CXF Servlet</display-name>
- <servlet-class>
- org.apache.cxf.transport.servlet.CXFServlet
- </servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/beans.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml Sun Dec 14 23:40:33 2008
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: beans -->
-<!--beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:simple="http://cxf.apache.org/simple"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop
-http://www.springframework.org/schema/aop/spring-aop.xsd
-http://www.springframework.org/schema/security
-http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
-http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
- <jaxrs:server id="bookservice"
- address="/">
- <jaxrs:serviceBeans>
- <ref bean="bookstore"/>
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
- </jaxrs:providers>
- </jaxrs:server>
-
- <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoAnnotations"/>
- <aop:config proxy-target-class="true"/>
-
- <security:global-method-security>
- <security:protect-pointcut
- expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook())"
- access="ROLE_ADMIN"/>
- <security:protect-pointcut
- expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long))"
- access="ROLE_USER, ROLE_ADMIN"/>
- <security:protect-pointcut
- expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long, String))"
- access="ROLE_USER"/>
- </security:global-method-security>
-
- <security:http auto-config='true'>
- <security:http-basic />
- </security:http>
-
- <security:authentication-provider>
- <security:user-service>
- <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
- <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
- </security:user-service>
- </security:authentication-provider>
-</beans>
-<!-- END SNIPPET: beans -->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: beans -->
+<!--beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:simple="http://cxf.apache.org/simple"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://www.springframework.org/schema/security
+http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <jaxrs:server id="bookservice"
+ address="/">
+ <jaxrs:serviceBeans>
+ <ref bean="bookstore"/>
+ </jaxrs:serviceBeans>
+ <jaxrs:providers>
+ <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
+ </jaxrs:providers>
+ </jaxrs:server>
+
+ <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoAnnotations"/>
+ <aop:config proxy-target-class="true"/>
+
+ <security:global-method-security>
+ <security:protect-pointcut
+ expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook())"
+ access="ROLE_ADMIN"/>
+ <security:protect-pointcut
+ expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long))"
+ access="ROLE_USER, ROLE_ADMIN"/>
+ <security:protect-pointcut
+ expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long, String))"
+ access="ROLE_USER"/>
+ </security:global-method-security>
+
+ <security:http auto-config='true'>
+ <security:http-basic />
+ </security:http>
+
+ <security:authentication-provider>
+ <security:user-service>
+ <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
+ <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
+ </security:user-service>
+ </security:authentication-provider>
+</beans>
+<!-- END SNIPPET: beans -->
+
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml?rev=726634&r1=726633&r2=726634&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml Sun Dec 14 23:40:33 2008
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- START SNIPPET: webxml -->
-<web-app>
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/beans.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>
- org.springframework.web.context.ContextLoaderListener
- </listener-class>
- </listener>
-
- <filter>
- <filter-name>springSecurityFilterChain</filter-name>
- <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>springSecurityFilterChain</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <display-name>CXF Servlet</display-name>
- <servlet-class>
- org.apache.cxf.transport.servlet.CXFServlet
- </servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/beans.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml