Author: gmazza
Date: Sat Nov 26 14:38:59 2011
New Revision: 1206444
URL: http://svn.apache.org/viewvc?rev=1206444&view=rev
Log:
Switched to Ver 2.5 web.xml for remaining CXF samples having this file
Modified:
cxf/trunk/distribution/src/main/release/etc/web.xml
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/README.txt
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/README.txt
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/web.xml
Modified: cxf/trunk/distribution/src/main/release/etc/web.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/etc/web.xml?rev=1206444&r1=1206443&r2=1206444&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/etc/web.xml (original)
+++ cxf/trunk/distribution/src/main/release/etc/web.xml Sat Nov 26 14:38:59 2011
@@ -17,11 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
-<web-app>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
<display-name>cxf</display-name>
- <description>cxf</description>
+
<servlet>
<servlet-name>cxf</servlet-name>
<display-name>cxf</display-name>
@@ -29,11 +30,15 @@
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
+
<servlet-mapping>
<servlet-name>cxf</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
+
<session-config>
<session-timeout>60</session-timeout>
</session-config>
+
</web-app>
+
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/README.txt?rev=1206444&r1=1206443&r2=1206444&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/README.txt
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/README.txt
Sat Nov 26 14:38:59 2011
@@ -8,34 +8,19 @@ Spring. You'll learn how to:
* Set up the HTTP servlet transport
* Use CXF's Spring beans
-For more information see the documentation for this example in the
-user's guide.
-
-
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
Building and running the demo using Maven
----------------------------------------
+-----------------------------------------
From the base directory of this sample (i.e., where this README file is
located), the pom.xml file is used to build and run the demo.
Using either UNIX or Windows:
- mvn install (builds the demo)
+ mvn clean install (builds the demo)
mvn -Pserver (from one command line window)
mvn -Pclient (from a second command line window)
-
To remove the code generated from the WSDL file and the .class
files, run "mvn clean".
+
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml?rev=1206444&r1=1206443&r2=1206444&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml
Sat Nov 26 14:38:59 2011
@@ -1,9 +1,4 @@
<?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
@@ -22,8 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- START SNIPPET: webxml -->
-<web-app>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
@@ -49,4 +47,4 @@
<url-pattern>/*</url-pattern>
</servlet-mapping>
</web-app>
-<!-- END SNIPPET: webxml -->
\ No newline at end of file
+
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/README.txt?rev=1206444&r1=1206443&r2=1206444&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/README.txt
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/README.txt
Sat Nov 26 14:38:59 2011
@@ -1,63 +1,65 @@
-JAX-RS Spring Security Demo
-===========================
-
-The demo shows how to use Spring Security to secure a JAXRS-based RESTful
service.
-
-Two approaches toward securing a service are shown :
-- using Spring Security @Secured annotations
-- using AspectJ pointcut expressions
-
-Additionally, the JAXRS annotations inheritance is demonstrated, from
interface and abstract class
-definitions.
-
-
-
-
-Building and running the demo using maven
----------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the maven pom.xml file can be used to build and run the demo.
-
-
-Using either UNIX or Windows:
-
- mvn install
- mvn -Pserver (from one command line window)
- mvn -Pclient (from a second command line window)
-
-
-To remove the target dir, run "mvn clean".
-
-
-
-What happens when a demo is run
--------------------------------
-
-The demo web application located in a webapp folder is configured for two
users, fred and bob, be able to
-access various methods of a customer service bean.
-
-Fred is in both ROLE_CUSTOMER and ROLE_ADMIN roles, while Bob is in the
ROLE_CUSTOMER role only.
-After the server starts, the client is run and it's shown that Fred can access
all the methods
-while Bob can access only those which ROLE_CUSTOMER users are permitted to.
-
-By default, the demo is configured to use AspectJ pointcut expressions to
apply ACL rules to a service bean.
-Please see webapp/WEB-INF/beans.xml as well as src/demo/jaxrs/service.
-
-demo.jaxrs.service.CustomerServiceImpl bean implements CustomerService
interface. AspectJ expressions are applied to interface methods. Note, neither
CustomerService interface nor its CustomerServiceImpl implementation have
security-specific annotations. CustomerService interface does have JAXRS
annotations which are inherited by the service bean.
-
-To see the @Secured annotations in action, please uncomment
-
-<bean id="customerservice"
class="demo.jaxrs.service.CustomerServiceSecuredImpl"/>
-
-and comment the one used by default :
-
-<bean id="customerservice" class="demo.jaxrs.service.CustomerServiceImpl"/>
-
-Note this time @Secured annotations are coming from a CustomerServiceSecured
interface, while
-JAXRS annotations are inherited from AbstractCustomerServiceSecured class.
Also the secure annotations have to be explictly enabled in the configuration :
-
-<security:global-method-security secured-annotations="enabled"/>
-
-Basic authentication is used to provide user credentials to a service.
-No HTTPS protocol is used in this demo for simplicity only.
+JAX-RS Spring Security Demo
+===========================
+
+The demo shows how to use Spring Security to secure a JAXRS-based RESTful
service.
+
+Two approaches toward securing a service are shown :
+- using Spring Security @Secured annotations
+- using AspectJ pointcut expressions
+
+Additionally, JAXRS annotations inheritance is demonstrated, from both
interface
+and abstract class definitions.
+
+
+Building and running the demo using Maven
+-----------------------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo.
+
+Using either UNIX or Windows:
+
+ mvn clean install
+ mvn -Pserver (from one command line window)
+ mvn -Pclient (from a second command line window)
+
+To remove the target directory, run "mvn clean".
+
+
+What happens when the demo is run
+---------------------------------
+
+The demo web application located in a webapp folder is configured for two
users, Fred and Bob,
+to be able to access various methods of a customer service bean.
+
+Fred is in both ROLE_CUSTOMER and ROLE_ADMIN roles, while Bob is in the
ROLE_CUSTOMER role only.
+After the server starts, the client is run and it's shown that Fred can access
all the methods
+while Bob can access only those which ROLE_CUSTOMER users are permitted to.
+
+By default, the demo is configured to use AspectJ pointcut expressions to
apply ACL rules to a service bean.
+Please see src/main/webapp/WEB-INF/beans.xml as well as src/demo/jaxrs/service.
+
+demo.jaxrs.service.CustomerServiceImpl bean implements the CustomerService
interface. AspectJ
+expressions are applied to interface methods. Note neither CustomerService
interface nor
+its CustomerServiceImpl implementation have security-specific annotations.
CustomerService
+interface does have JAXRS annotations which are inherited by the service bean.
+
+To see the @Secured annotations in action, please uncomment
+
+<bean id="customerservice"
class="demo.jaxrs.service.CustomerServiceSecuredImpl"/>
+
+and comment the one used by default:
+
+<bean id="customerservice" class="demo.jaxrs.service.CustomerServiceImpl"/>
+
+Note this time @Secured annotations are coming from a CustomerServiceSecured
interface,
+while JAXRS annotations are inherited from AbstractCustomerServiceSecured
class. Also
+the secure annotations have to be explictly enabled in the configuration:
+
+<security:global-method-security secured-annotations="enabled"/>
+
+Basic authentication is used to provide user credentials to a service.
+For simplicity, the HTTPS protocol is avoided in this sample but should be used
+in production.
+
+
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/web.xml?rev=1206444&r1=1206443&r2=1206444&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/web.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/web.xml
Sat Nov 26 14:38:59 2011
@@ -1,63 +1,61 @@
-<?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 -->
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
+
+ <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>
+
