SEC-1238: Disable portlet module

config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc

@@ -247,7 +247,7 @@ protect-pointcut.attlist &=
 
 http =
     ## Container element for HTTP security configuration
-   element http {http.attlist, (intercept-url+ & access-denied-handler? & form-login? & openid-login? & x509? & http-basic? & logout? & concurrent-session-control? & remember-me? & anonymous? & port-mappings & custom-filter*) }
+   element http {http.attlist, (intercept-url+ & access-denied-handler? & form-login? & openid-login? & x509? & http-basic? & logout? & concurrent-session-control? & remember-me? & anonymous? & port-mappings & custom-filter* & request-cache?) }
 http.attlist &=
     ## Automatically registers a login form, BASIC authentication, anonymous authentication, logout services, remember-me and servlet-api-integration. If set to "true", all of these capabilities are added (although you can still customize the configuration of each by providing the respective element). If unspecified, defaults to "false".
     attribute auto-config {boolean}?
@@ -335,6 +335,10 @@ logout.attlist &=
 	## Specifies whether a logout also causes HttpSession invalidation, which is generally desirable. If unspecified, defaults to true.
     attribute invalidate-session {boolean}?
     
+request-cache =
+    ## Allow the RequestCache used for saving requests during the login process to be set
+    element request-cache {ref}
+
 form-login =
     ## Sets up a form login configuration for authentication with a username and password
     element form-login {form-login.attlist, empty}

config/src/main/resources/org/springframework/security/config/spring-security-3.0.xsd

@@ -826,6 +826,7 @@
                </xs:complexType>
             </xs:element>
             <xs:element ref="security:custom-filter"/>
+            <xs:element ref="security:request-cache"/>
          </xs:choice>
          <xs:attributeGroup ref="security:http.attlist"/>
       </xs:complexType>
@@ -1053,6 +1054,15 @@
          </xs:annotation>
       </xs:attribute>
    </xs:attributeGroup>
+   <xs:element name="request-cache">
+      <xs:annotation>
+         <xs:documentation>Allow the RequestCache used for saving requests during the login process
+            to be set</xs:documentation>
+      </xs:annotation>
+      <xs:complexType>
+         <xs:attributeGroup ref="security:ref"/>
+      </xs:complexType>
+   </xs:element>
    <xs:attributeGroup name="form-login.attlist">
       <xs:attribute name="login-processing-url" type="xs:token">
          <xs:annotation>

pom.xml

@@ -17,7 +17,6 @@
         <module>openid</module>
         <module>ntlm</module>
         <module>taglibs</module>
-        <module>portlet</module>
 		<module>aspects</module>
         <module>samples</module>
         <!--module>itest</module-->

samples/cas/server/pom.xml

@@ -17,7 +17,7 @@
                 <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/cas</contextPath>
-                    <webApp>${basedir}/cas-server-webapp-3.3.1.war</webApp>
+                    <webApp>${basedir}/cas-server-webapp-3.3.3.war</webApp>
                     <connectors>
                         <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
                             <port>9443</port>