Author: ffang
Date: Sun Jun 12 07:06:27 2011
New Revision: 1134872
URL: http://svn.apache.org/viewvc?rev=1134872&view=rev
Log:
[SM-2092]upgrade to cxf 2.4.0
Removed:
servicemix/smx3/trunk/distributions/apache-servicemix-web/src/main/java/org/apache/servicemix/web/cxf/
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix-web/src/main/webapp/WEB-INF/web.xml
servicemix/smx3/trunk/pom.xml
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix-web/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix-web/src/main/webapp/WEB-INF/web.xml?rev=1134872&r1=1134871&r2=1134872&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix-web/src/main/webapp/WEB-INF/web.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix-web/src/main/webapp/WEB-INF/web.xml
Sun Jun 12 07:06:27 2011
@@ -108,7 +108,7 @@
<servlet-name>cxf</servlet-name>
<display-name>cxf</display-name>
<description>Apache CXF Endpoint</description>
-
<servlet-class>org.apache.servicemix.web.cxf.CXFManagedServlet</servlet-class>
+
<servlet-class>org.apache.cxf.transport.servlet.CXFNonSpringServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=1134872&r1=1134871&r2=1134872&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sun Jun 12 07:06:27 2011
@@ -133,7 +133,7 @@
<sitemesh-version>2.2.1</sitemesh-version>
<woden-version>1.0.0M6</woden-version>
<!-- It should be updated to 2.4.0 -->
- <cxf-version>2.3.3</cxf-version>
+ <cxf-version>2.4.0</cxf-version>
<jaxb.version>2.2</jaxb.version>
<jaxb.impl.version>2.2.1.1</jaxb.impl.version>
<jaxb.xjc.version>2.2.1.1</jaxb.xjc.version>