Author: dkulp
Date: Mon Aug 26 20:12:19 2013
New Revision: 1517677
URL: http://svn.apache.org/r1517677
Log:
Merged revisions 1517661 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1517661 | dkulp | 2013-08-26 15:55:13 -0400 (Mon, 26 Aug 2013) | 2 lines
Update the order of some of the elements to match the actual schema so the
eclipse web.xml validator is happy
........
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/web.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/web.xml
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -24,9 +24,9 @@
<display-name>cxf</display-name>
<servlet>
- <servlet-name>cxf</servlet-name>
- <display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
+ <servlet-name>cxf</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -24,9 +24,9 @@
<display-name>cxf</display-name>
<servlet>
- <servlet-name>cxf</servlet-name>
- <display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
+ <servlet-name>cxf</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -24,9 +24,9 @@
<display-name>cxf</display-name>
<servlet>
- <servlet-name>cxf</servlet-name>
- <display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
+ <servlet-name>cxf</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -45,8 +45,9 @@
<servlet>
+ <description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
<servlet-name>CXFServlet</servlet-name>
- <display-name>CXF Servlet</display-name>
<servlet-class>
org.apache.cxf.transport.servlet.CXFServlet
</servlet-class>
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -24,9 +24,9 @@
<display-name>cxf</display-name>
<servlet>
- <servlet-name>cxf</servlet-name>
- <display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
+ <servlet-name>cxf</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
<async-supported>true</async-supported>
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -24,9 +24,9 @@
<display-name>cxf</display-name>
<servlet>
- <servlet-name>cxf</servlet-name>
- <display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
+ <servlet-name>cxf</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/web.xml?rev=1517677&r1=1517676&r2=1517677&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/webapp/WEB-INF/web.xml
Mon Aug 26 20:12:19 2013
@@ -24,9 +24,9 @@
<display-name>cxf</display-name>
<servlet>
- <servlet-name>cxf</servlet-name>
- <display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
+ <display-name>cxf</display-name>
+ <servlet-name>cxf</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
