Author: coheigea
Date: Tue Mar 5 17:17:17 2013
New Revision: 1452900
URL: http://svn.apache.org/r1452900
Log:
Merged revisions 1452899 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1452899 | coheigea | 2013-03-05 17:12:40 +0000 (Tue, 05 Mar 2013) | 2 lines
Load STS war on startup
........
Modified:
cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
Modified:
cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml?rev=1452900&r1=1452899&r2=1452900&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
Tue Mar 5 17:17:17 2013
@@ -24,7 +24,7 @@
<servlet>
<servlet-name>sts</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
- <!-- <load-on-startup>1</load-on-startup> -->
+ <load-on-startup>1</load-on-startup>
<init-param>
<param-name>config-location</param-name>
<param-value>WEB-INF/cxf-servlet.xml</param-value>
