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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun 19 12:51:04 2014
New Revision: 6122

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6122&view=rev
Log:
Stop defaulting in artifact endpoint URL.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1AttributeQueryTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2AttributeQueryTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ECPProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java?rev=6122&r1=6121&r2=6122&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java Thu Jun 19 12:51:04 2014
@@ -27,7 +27,6 @@
 import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
 import net.shibboleth.idp.saml.profile.config.logic.LegacyEncryptionRequirementPredicate;
 import net.shibboleth.idp.saml.profile.config.logic.LegacySigningRequirementPredicate;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
@@ -50,9 +49,6 @@
  * and for elements which inherit from <code>saml:SAMLProfileConfigutationType</code>.
  */
 public abstract class BaseSAMLProfileConfigurationParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Bean name of legacy EKR to load. */
-    @Nonnull @NotEmpty private static final String DEFAULT_EKR = "shibboleth.LegacyRelyingParty.EncryptedKeyResolver";
     
     /** Class logger. */
     @Nonnull private Logger log = LoggerFactory.getLogger(BaseSAMLProfileConfigurationParser.class);
@@ -100,9 +96,6 @@
         if (element.hasAttributeNS(null, "artifactResolutionServiceURL")) {
             definition.addPropertyValue("artifactResolutionServiceURL",
                     element.getAttributeNS(null, "artifactResolutionServiceURL"));
-        } else {
-            definition.addPropertyReference("artifactResolutionServiceURL", getProfileBeanNamePrefix()
-                    + "ArtifactServiceURL");
         }
 
         if (element.hasAttributeNS(null, "artifactResolutionServiceIndex")) {

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java?rev=6122&r1=6121&r2=6122&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java Thu Jun 19 12:51:04 2014
@@ -50,7 +50,6 @@
         
         final SAMLArtifactConfiguration artifact = profile.getArtifactConfiguration();
         Assert.assertNull(artifact.getArtifactType());
-        Assert.assertEquals(artifact.getArtifactResolutionServiceURL(), "https://idp.example.org/Logout");
         Assert.assertEquals(artifact.getArtifactResolutionServiceIndex().intValue(), 3214);
         Assert.assertNull(profile.getSecurityConfiguration());
     }
@@ -83,7 +82,6 @@
         
 
         final SAMLArtifactConfiguration artifact = profile.getArtifactConfiguration();
-        Assert.assertEquals(artifact.getArtifactResolutionServiceURL(), "https://idp.example.org/Logout");
         Assert.assertEquals(artifact.getArtifactType(), new byte[] { 0x0, 0x7, });
         Assert.assertEquals(artifact.getArtifactResolutionServiceIndex().intValue(), 3214);
 


[... 197 lines stripped ...]