[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 28 09:34:32 2014
New Revision: 5778

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5778&view=rev
Log:
IDP-401 secuirtyPolicyRef and attributeAuthority are centrally deprecated (and no longer default in the schema).  Remove all per Configuration parser support.  Fail parsing in the face of localityDNSName and localityAddress 

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityAddress.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpLocalityDNSName.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactResolutionProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1AttributeQueryProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactResolutionProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2AttributeQueryProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2LogoutRequestProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ECPProfileTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java?rev=5778&r1=5777&r2=5778&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java Mon Apr 28 09:34:32 2014
@@ -22,8 +22,6 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -35,9 +33,6 @@
  * from <code>saml:SAML2ProfileConfigutationType</code>.
  */
 public abstract class BaseSAML2ProfileConfigurationParser extends BaseSAMLProfileConfigurationParser {
-
-    /** logger. */
-    private Logger log = LoggerFactory.getLogger(BaseSAML2ProfileConfigurationParser.class);
 
     /**
      * Get the list of proxy audiences from the &lt;ProxyAudience&gt; sub-elements.
@@ -75,13 +70,6 @@
         if (element.hasAttributeNS(null, "assertionProxyCount")) {
             builder.addPropertyValue("proxyCount", element.getAttributeNS(null, "assertionProxyCount"));
         }
-        if (element.hasAttributeNS(null, "attributeAuthority")) {
-            final String attributeAuthority =
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "attributeAuthority"));
-            if (null != attributeAuthority && !"shibboleth.SAML2AttributeAuthority".equals(attributeAuthority)) {
-                log.warn("Non default value for attributeAuthority of '{}' has been ignored", attributeAuthority);
-            }
-        }
         builder.addPropertyValue("proxyAudiences", getProxyAudiences(element));
     }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactResolutionProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactResolutionProfileParser.java?rev=5778&r1=5777&r2=5778&view=diff

[... 497 lines stripped ...]