- Created HeaderFactory abstraction

- Implemented different ALLOW-FROM strategies as specified in the proposal.

Conflicts:
	config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
	config/src/test/groovy/org/springframework/security/config/http/HttpHeadersConfigTests.groovy

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

@@ -729,8 +729,18 @@ frame-options.attlist &=
 	## Specify the policy to use for the X-Frame-Options-Header.
 	attribute policy {"DENY","SAMEORIGIN","ALLOW-FROM"}?
 frame-options.attlist &=
-	## Specify the origin to use when ALLOW-FROM is chosen.
-	attribute origin {xsd:token}?
+	## Specify the strategy to use when ALLOW-FROM is chosen.
+	attribute strategy {"static","whitelist","regexp"}?
+frame-options.attlist &=
+	## Specify the a reference to the custom AllowFromStrategy to use when ALLOW-FROM is chosen.
+	ref?
+frame-options.attlist &=
+	## Specify the a value to use for the chosen strategy.
+	attribute value {xsd:string}?
+frame-options.attlist &=
+	## Specify the request parameter to use for the origin when using a 'whitelist' or 'regexp' based strategy. Default is 'from'.
+	attribute from-parameter {xsd:string}?
+
 
 xss-protection =
 	## Enable basic XSS browser protection, supported by newer browsers (IE8+), will set the X-XSS-Protection header.
@@ -751,10 +761,13 @@ header=
 	element header {header.attlist}
 header.attlist &=
 	## The name of the header to add.
-	attribute name {xsd:token}
+	attribute name {xsd:token}?
 header.attlist &=
 	## The value for the header.
-	attribute value {xsd:token}
+	attribute value {xsd:token}?
+header.attlist &=
+    ## Reference to a custom HeaderFactory implementation.
+    ref?
 
 any-user-service = user-service | jdbc-user-service | ldap-user-service
 

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

@@ -2271,9 +2271,35 @@
             </xs:restriction>
          </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="origin" type="xs:token">
+      <xs:attribute name="strategy">
          <xs:annotation>
-            <xs:documentation>Specify the origin to use when ALLOW-FROM is chosen.
+            <xs:documentation>Specify the strategy to use when ALLOW-FROM is chosen.
+                </xs:documentation>
+         </xs:annotation>
+         <xs:simpleType>
+            <xs:restriction base="xs:token">
+               <xs:enumeration value="static"/>
+               <xs:enumeration value="whitelist"/>
+               <xs:enumeration value="regexp"/>
+            </xs:restriction>
+         </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="ref" type="xs:token">
+         <xs:annotation>
+            <xs:documentation>Defines a reference to a Spring bean Id.
+                </xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="value" type="xs:string">
+         <xs:annotation>
+            <xs:documentation>Specify the a value to use for the chosen strategy.
+                </xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="from-parameter" type="xs:string">
+         <xs:annotation>
+            <xs:documentation>Specify the request parameter to use for the origin when using a 'whitelist' or 'regexp'
+                based strategy. Default is 'from'.
                 </xs:documentation>
          </xs:annotation>
       </xs:attribute>
@@ -2319,18 +2345,24 @@
       </xs:complexType>
    </xs:element>
   <xs:attributeGroup name="header.attlist">
-      <xs:attribute name="name" use="required" type="xs:token">
+      <xs:attribute name="name" type="xs:token">
          <xs:annotation>
             <xs:documentation>The name of the header to add.
                 </xs:documentation>
          </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="value" use="required" type="xs:token">
+      <xs:attribute name="value" type="xs:token">
          <xs:annotation>
             <xs:documentation>The value for the header.
                 </xs:documentation>
          </xs:annotation>
       </xs:attribute>
+      <xs:attribute name="ref" type="xs:token">
+         <xs:annotation>
+            <xs:documentation>Defines a reference to a Spring bean Id.
+                </xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="any-user-service" abstract="true"/>
   <xs:element name="custom-filter">