[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Sep 20 01:47:17 2014
New Revision: 6546

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6546&view=rev
Log:
Rearrange and refactor predicates to reuse EntityDescriptor predicates from OpenSAML

Added:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/AbstractRelyingPartyLookupFunction.java
      - copied, changed from r6545, trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/AbstractRelyingPartyLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/context/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/context/navigate/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/context/navigate/EntityDescriptorLookupFunction.java
      - copied, changed from r6545, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/EntityDescriptorLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/context/navigate/SAMLMetadataContextLookupFunction.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/context/navigate/package-info.java   (with props)
Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/AbstractRelyingPartyLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AssertionLifetimeLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/EntityDescriptorLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/ProxyAudienceRestrictionsLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/ProxyCountLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/SessionLifetimeLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java?rev=6546&r1=6545&r2=6546&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java Sat Sep 20 01:47:17 2014
@@ -24,7 +24,7 @@
 import net.shibboleth.idp.attribute.filter.matcher.saml.impl.AttributeInMetadataMatcher;
 import net.shibboleth.idp.attribute.filter.spring.matcher.BaseAttributeValueMatcherParser;
 import net.shibboleth.idp.saml.profile.config.navigate.AttributeConsumerServiceLookupFunction;
-import net.shibboleth.idp.saml.profile.config.navigate.EntityDescriptorLookupFunction;
+import net.shibboleth.idp.saml.profile.context.navigate.EntityDescriptorLookupFunction;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
 

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java?rev=6546&r1=6545&r2=6546&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java Sat Sep 20 01:47:17 2014
@@ -21,6 +21,7 @@
 
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;

[... 300 lines stripped ...]