X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fweb%2Ftopology%2Fsrc%2Fmain%2Fresources%2FWEB-INF%2Fweb.xml;h=274908caec7610ff8d541a36eed882ce7e8a57b4;hb=0cb7e3604b8a33f6b1aa01c561137e6c6aad85b0;hp=bbf9a3479ca351e1794fb62e6c8c5ab6ca00d1da;hpb=29f7cfb54b580928c7feac63abce028a7014b0d5;p=controller.git

diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml b/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml
index bbf9a3479c..274908caec 100644
--- a/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml
@@ -1,18 +1,55 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>free access</web-resource-name>
+			<url-pattern>/js/*</url-pattern>
+			<url-pattern>/images/*</url-pattern>
+			<url-pattern>/css/*</url-pattern>
+			<url-pattern>/favicon.ico</url-pattern>
+		</web-resource-collection>
+	</security-constraint>
 
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/spring/*.xml</param-value>
-	</context-param>
+	<security-constraint>
+		<display-name>TopologyApp</display-name>
+		<web-resource-collection>
+			<web-resource-name>TopoGUI</web-resource-name>
+			<url-pattern>/*</url-pattern>
+		</web-resource-collection>
+		<auth-constraint>
+			<role-name>System-Admin</role-name>
+			<role-name>Network-Admin</role-name>
+			<role-name>Network-Operator</role-name>
+			<role-name>Container-User</role-name>
+		</auth-constraint>
+	</security-constraint>
+	<security-role>
+		<role-name>System-Admin</role-name>
+	</security-role>
+	<security-role>
+		<role-name>Network-Admin</role-name>
+	</security-role>
+	<security-role>
+		<role-name>Network-Operator</role-name>
+	</security-role>
+	<security-role>
+		<role-name>Container-User</role-name>
+	</security-role>
 
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+	<login-config>
+		<auth-method>FORM</auth-method>
+		<form-login-config>
+			<form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
+			<form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
+		</form-login-config>
+	</login-config>
 
+    <error-page>
+            <error-code>403</error-code>
+            <location>/WEB-INF/jsp/autherror.jsp</location>
+    </error-page>
 
 	<servlet>
 		<servlet-name>Topology</servlet-name>
@@ -20,23 +57,22 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
+
+
 	<servlet-mapping>
 		<servlet-name>Topology</servlet-name>
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
 	<listener>
 		<listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
 	</listener>
 
+	<session-config>
+		<cookie-config>
+			<path>/</path>
+		</cookie-config>
+	</session-config>
+
+
 </web-app>