Author: kevinshen Date: 2010-01-19 03:18:40 +0100 (Tue, 19 Jan 2010) New Revision: 40602
Modified: CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml Log: CMSC-1613 SSO - login fails second time you loggin. Modified: CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml =================================================================== --- CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml 2010-01-18 20:16:19 UTC (rev 40601) +++ CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/web.xml 2010-01-19 02:18:40 UTC (rev 40602) @@ -108,56 +108,33 @@ <filter-name>SecurityFilterChainProxy</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <!-- - <filter> - <filter-name>CAS Validation Filter</filter-name> - <filter-class>org.jasig.cas.client.validation.Saml11TicketValidationFilter</filter-class> - </filter> - - <filter> - <filter-name>CAS Single Sign Out Filter</filter-name> - <filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class> - </filter> - - <filter> - <filter-name>SSO Filter</filter-name> - <filter-class>com.finalist.cmsc.community.filter.SingleSignOnFilter</filter-class> - </filter> - - <filter> - <filter-name>CAS HttpServletRequest Wrapper Filter</filter-name> - <filter-class>org.jasig.cas.client.util.HttpServletRequestWrapperFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>CAS Validation Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>CAS HttpServletRequest Wrapper Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>CAS Single Sign Out Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>SSO Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - --> +<!-- + <filter> + <filter-name>CAS Validation Filter</filter-name> + <filter-class>org.jasig.cas.client.validation.Saml11TicketValidationFilter</filter-class> + </filter> <filter> - <filter-name>SecurityFilterChainProxy</filter-name> - <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class> - <init-param> - <param-name>targetClass</param-name> - <param-value>org.acegisecurity.util.FilterChainProxy</param-value> - </init-param> + <filter-name>SSO Filter</filter-name> + <filter-class>com.finalist.cmsc.community.filter.SingleSignOnFilter</filter-class> </filter> + <filter> + <filter-name>CAS HttpServletRequest Wrapper Filter</filter-name> + <filter-class>org.jasig.cas.client.util.HttpServletRequestWrapperFilter</filter-class> + </filter> + <filter-mapping> - <filter-name>SecurityFilterChainProxy</filter-name> - <url-pattern>/*</url-pattern> + <filter-name>CAS Validation Filter</filter-name> + <url-pattern>/*</url-pattern> </filter-mapping> + <filter-mapping> + <filter-name>CAS HttpServletRequest Wrapper Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>SSO Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> +--> <filter> <description>Filter catch all requests.</description> @@ -230,7 +207,9 @@ <servlet> <display-name>Pluto Driver</display-name> <servlet-name>CmscPortalServlet</servlet-name> - <servlet-class>com.finalist.cmsc.portalImpl.PortalServlet</servlet-class> + <!--servlet-class>com.finalist.cmsc.portalImpl.PortalServlet</servlet-class--> + <!--used by SSO--> + <servlet-class>com.finalist.cmsc.portalImpl.SecurePortalServlet</servlet-class> <init-param> <param-name>charset</param-name> <param-value>utf-8</param-value> @@ -242,7 +221,7 @@ <description>All portlets are handled through this servlet.</description> <display-name>Portlet servlet</display-name> <servlet-name>CmscPortletServlet</servlet-name> - <servlet-class>com.finalist.cmsc.portalImpl.SecurePortletServlet</servlet-class> + <servlet-class>com.finalist.cmsc.portalImpl.PortletServlet</servlet-class> <load-on-startup>3</load-on-startup> </servlet> @@ -361,7 +340,7 @@ <param-value>true</param-value> </init-param> </servlet> -<!--Community logout --> +<!--Community logout <servlet> <servlet-name>CommunityLogoutServlet</servlet-name> <servlet-class>com.finalist.cmsc.community.servlet.CommunityLogoutServlet</servlet-class> @@ -371,6 +350,7 @@ <servlet-name>CommunityLogoutServlet</servlet-name> <url-pattern>/LogoutServlet</url-pattern> </servlet-mapping> + --> <!-- Installer --> <!-- <servlet> <servlet-name>install</servlet-name> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs