[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: Sun Mar 15 13:47:01 2015
New Revision: 7421

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7421&view=rev
Log:
IDP-646 Allow seconds as a non duration input to RequiredValidUntil

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilFactoryBean.java   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java?rev=7421&r1=7420&r2=7421&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParser.java Sun Mar 15 13:47:01 2015
@@ -21,7 +21,6 @@
 
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.MetadataNamespaceHandler;
 
-import org.opensaml.saml.metadata.resolver.filter.impl.RequiredValidUntilFilter;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -37,7 +36,7 @@
 
     /** {@inheritDoc} */
     @Override protected Class<?> getBeanClass(Element element) {
-        return RequiredValidUntilFilter.class;
+        return RequiredValidUntilFactoryBean.class;
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java?rev=7421&r1=7420&r2=7421&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java Sun Mar 15 13:47:01 2015
@@ -45,7 +45,7 @@
         Assert.assertEquals(filter.getMaxValidityInterval(), 2*3600*24*1000);
     }
 
-    @Test(enabled=false) public void nonDuration() throws IOException {
+    @Test public void nonDuration() throws IOException {
         MetadataResolver resolver = getBean(MetadataResolver.class, "filter/requiredValidUntilParamNonDuration.xml");
 
         final RequiredValidUntilFilter filter = (RequiredValidUntilFilter) resolver.getMetadataFilter();