cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1478845 - in /cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF: applicationContext.xml cxf-servlet.xml web.xml
Date Fri, 03 May 2013 15:45:40 GMT
Author: dkulp
Date: Fri May  3 15:45:39 2013
New Revision: 1478845

URL: http://svn.apache.org/r1478845
Log:
Merged revisions 1478513 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1478513 | owulff | 2013-05-02 16:17:40 -0400 (Thu, 02 May 2013) | 2 lines

  [CXF-4854] Load the STS war on startup

........

Added:
    cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml
      - copied, changed from r1478844, cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-servlet.xml
Removed:
    cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-servlet.xml
Modified:
    cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml

Copied: cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml
(from r1478844, cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-servlet.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml?p2=cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml&p1=cxf/branches/2.7.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-servlet.xml&r1=1478844&r2=1478845&rev=1478845&view=diff
==============================================================================
    (empty)

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=1478845&r1=1478844&r2=1478845&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 Fri May
 3 15:45:39 2013
@@ -21,14 +21,21 @@
         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
          http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 	<display-name>CXF STS</display-name>
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>		
+		<param-value>WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+
 	<servlet>
 		<servlet-name>sts</servlet-name>
 		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
-		<init-param>
-			<param-name>config-location</param-name>
-			<param-value>WEB-INF/cxf-servlet.xml</param-value>
-		</init-param>
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>sts</servlet-name>



Mime
View raw message