cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1464150 - in /cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF: applicationContext.xml cxf-servlet.xml web.xml
Date Wed, 03 Apr 2013 18:43:06 GMT
Author: owulff
Date: Wed Apr  3 18:43:06 2013
New Revision: 1464150

URL: http://svn.apache.org/r1464150
Log:
Initialize STS on startup

Added:
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
      - copied, changed from r1463742, cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml
Removed:
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml
Modified:
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml

Copied: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml (from
r1463742, cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml)
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml?p2=cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml&p1=cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-servlet.xml&r1=1463742&r2=1464150&rev=1464150&view=diff
==============================================================================
    (empty)

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml?rev=1464150&r1=1464149&r2=1464150&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml Wed Apr  3 18:43:06 2013
@@ -4,19 +4,27 @@
 	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>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
+
 	<servlet-mapping>
 		<servlet-name>sts</servlet-name>
 		<url-pattern>/*</url-pattern>
 	</servlet-mapping>
+
 	<session-config>
 		<session-timeout>60</session-timeout>
 	</session-config>



Mime
View raw message