Author: yradtsevich Date: 2010-08-06 10:53:47 -0400 (Fri, 06 Aug 2010) New Revision: 23971 Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: https://jira.jboss.org/browse/JBIDE-6711 : Spring templates for VPE - JUnit tests for VPE spring security tags Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/springapp-servlet.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + + <!-- the application context definition for the springapp DispatcherServlet --> + + <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> + <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> + <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="beanValidator"/> + </bean> + <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + </bean> + <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/authorize.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/authentication.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/accesscontrollist.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + + <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> + <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> + + <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> + <property name="prefix" value="/WEB-INF/jsp/"></property> + <property name="suffix" value=".jsp"></property> + </bean> +</beans> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,13 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +</head> +<body> + <div id="accesscontrollist1"> + <security:accesscontrollist hasPermission="1,2" domainObject="formBean"> + This will be shown if the user has either of the permissions represented by the values "1" or "2" on the given object. + </security:accesscontrollist> + </div> +</body> +</html> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,9 @@ +<tests> + <test id="accesscontrollist1"> + <DIV ID="accesscontrollist1"> + <DIV> + <SPAN CLASS="vpe-text">This will be shown if the user has either of the permissions represented by the values "1" or "2" on the given object.</SPAN> + </DIV> + </DIV> + </test> +</tests> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,11 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +</head> +<body> + <div> + Your name is <b id="authentication1"><security:authentication property="principal" /></b>. + </div> +</body> +</html> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authentication.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,7 @@ +<tests> + <test id="authentication1"> + <B ID="authentication1"> + <SPAN CLASS="vpe-text">principal</SPAN> + </B> + </test> +</tests> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,18 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +</head> +<body> + <div id="authorize1"> + <security:authorize ifAllGranted="ROLE_USER"> + <a href="#">Logout</a> + </security:authorize> + </div> + <div id="authorize2"> + <security:authorize ifAllGranted="ROLE_ANONYMOUS"> + <a href="#">Login</a> + </security:authorize> + </div> +</body> +</html> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/authorize.jsp.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,16 @@ +<tests> + <test id="authorize1"> + <DIV ID="authorize1"> + <DIV><A> + <SPAN CLASS="vpe-text">Logout</SPAN></A> + </DIV> + </DIV> + </test> + <test id="authorize2"> + <DIV ID="authorize2"> + <DIV> + <A><SPAN CLASS="vpe-text">Login</SPAN></A> + </DIV> + </DIV> + </test> +</tests> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/root-context.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"... + + <!-- Root Context: defines shared resources accessible to all other web components --> + + <!-- Configures shared security layer --> + <import resource="security.xml" /> +</beans> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/security.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans:beans xmlns="http://www.springframework.org/schema/security" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:beans="http://www.springframework.org/schema/beans" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd&qu... + + <http auto-config="true"> + <!-- Authentication policy --> + <anonymous username="guest" granted-authority="ROLE_ANONYMOUS" /> + <intercept-url pattern="/**" access="ROLE_ANONYMOUS" /> + </http> + + <!-- + Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc) + + usernames/passwords are: + keith/melbourne + erwin/leuven + jeremy/atlanta + scott/rochester + --> + <authentication-manager> + <authentication-provider> + <password-encoder hash="md5" /> + <user-service> + <user name="keith" password="417c7382b16c395bc25b5da1398cf076" authorities="ROLE_USER, ROLE_SUPERVISOR" /> + <user name="erwin" password="12430911a8af075c6f41c6976af22b09" authorities="ROLE_USER, ROLE_SUPERVISOR" /> + <user name="jeremy" password="57c6cbff0d421449be820763f03139eb" authorities="ROLE_USER" /> + <user name="scott" password="942f2339bf50796de535a384f0d1af3e" authorities="ROLE_USER" /> + </user-service> + </authentication-provider> + </authentication-manager> +</beans:beans> Copied: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml (from rev 23970, trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/spring/springapp-servlet.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + + <!-- the application context definition for the springapp DispatcherServlet --> + + <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + <property name="successView" value="errors"/> + </bean> + <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + <property name="successView" value="bind"/> + </bean> + <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="beanValidator"/> + <property name="successView" value="hasBindErrors"/> + </bean> + <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> + <property name="validator" ref="userValidator"/> + <property name="successView" value="nestedPath"/> + </bean> + <bean name="/transform.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.DayOfWeekFormController"/> + <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/htmlEscape.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + + <bean name="/authorize.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/authentication.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/accesscontrollist.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + + <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> + <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> + + <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> + <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"></property> + <property name="prefix" value="/WEB-INF/jsp/"></property> + <property name="suffix" value=".jsp"></property> + </bean> +</beans> Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - - <!-- the application context definition for the springapp DispatcherServlet --> - - <bean name="/form.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/checkbox.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/checkboxes.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/radiobutton.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/radiobuttons.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/option.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/options.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/eval.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - <property name="successView" value="errors"/> - </bean> - <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - <property name="successView" value="bind"/> - </bean> - <bean name="/hasBindErrors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="beanValidator"/> - <property name="successView" value="hasBindErrors"/> - </bean> - <bean name="/nestedPath.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController"> - <property name="validator" ref="userValidator"/> - <property name="successView" value="nestedPath"/> - </bean> - <bean name="/transform.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.DayOfWeekFormController"/> - <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean name="/htmlEscape.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> - <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> - <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> - - <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"> - <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"></property> - <property name="prefix" value="/WEB-INF/jsp/"></property> - <property name="suffix" value=".jsp"></property> - </bean> -</beans> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/web.xml 2010-08-06 14:53:47 UTC (rev 23971) @@ -1,26 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" - 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" > +<web-app version="2.4" 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"> + + <!-- The definition of the Root Spring Container shared by all Servlets and Filters --> + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring/root-context.xml</param-value> + </context-param> - <servlet> - <servlet-name>springapp</servlet-name> - <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> + <servlet> + <servlet-name>springapp</servlet-name> + <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <init-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring/springapp-servlet.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <!-- Creates the Spring Container shared by all Servlets and Filters --> + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> - <servlet-mapping> - <servlet-name>springapp</servlet-name> - <url-pattern>*.htm</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>springapp</servlet-name> + <url-pattern>*.htm</url-pattern> + </servlet-mapping> - <welcome-file-list> - <welcome-file> + <!-- Secures the application --> + <filter> + <filter-name>springSecurity</filter-name> + <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> + <init-param> + <param-name>targetBeanName</param-name> + <param-value>springSecurityFilterChain</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>springSecurity</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <welcome-file-list> + <welcome-file> index.jsp </welcome-file> - </welcome-file-list> - + </welcome-file-list> </web-app> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-06 14:53:47 UTC (rev 23971) @@ -28,4 +28,7 @@ <br/> <a href="htmlEscape.htm">htmlEscape.htm</a> <br/> - +<a href="authorize.htm">authorize.htm</a> +<br/> +<a href="authentication.htm">authentication.htm</a> +<br/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 13:19:19 UTC (rev 23970) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-06 14:53:47 UTC (rev 23971) @@ -116,7 +116,19 @@ public void testUrl() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/url.jsp"); //$NON-NLS-1$ } + + public void testAuthorize() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/authorize.jsp"); //$NON-NLS-1$ + } + + public void testAuthentication() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/authentication.jsp"); //$NON-NLS-1$ + } + public void testAccesscontrollist() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/accesscontrollist.jsp"); //$NON-NLS-1$ + } + public void testTransform() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/transform.jsp"); //$NON-NLS-1$ }