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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Apr  1 21:19:14 2016
New Revision: 8192

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8192&view=rev
Log:
Relating to OSJ-161, add Spring schema and parser support for 2 new properties for FileBackedHTTPMetadataResolver.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileBackedHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileBackedHTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileBackedHTTPMetadataProviderParser.java?rev=8192&r1=8191&r2=8192&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileBackedHTTPMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileBackedHTTPMetadataProviderParser.java	Fri Apr  1 21:19:14 2016
@@ -47,5 +47,15 @@
         super.doNativeParse(element, parserContext, builder);
 
         builder.addConstructorArgValue(StringSupport.trimOrNull(element.getAttributeNS(null, "backingFile")));
+        
+        if (element.hasAttributeNS(null, "initializeFromBackupFile")) {
+            builder.addPropertyValue("initializeFromBackupFile",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "initializeFromBackupFile")));
+        }
+        
+        if (element.hasAttributeNS(null, "backupFileInitNextRefreshDelay")) {
+            builder.addPropertyValue("backupFileInitNextRefreshDelay",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "backupFileInitNextRefreshDelay")));
+        }
     }
 }

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java?rev=8192&r1=8191&r2=8192&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java	Fri Apr  1 21:19:14 2016
@@ -45,6 +45,9 @@
         Assert.assertEquals(resolver.getRefreshDelayFactor(), 0.75, 0.001);
         Assert.assertSame(resolver.getParserPool(), parserPool);
         
+        Assert.assertEquals(resolver.isInitializeFromBackupFile(), false);
+        Assert.assertEquals(resolver.getBackupFileInitNextRefreshDelay(), 10*1000);
+        
         Assert.assertNull(resolver.resolveSingle(criteriaFor(SP_ID)));
     }
     

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml?rev=8192&r1=8191&r2=8192&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml	(original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml	Fri Apr  1 21:19:14 2016
@@ -6,6 +6,8 @@
 
 	id="fileBackedHTTPEntity" xsi:type="metadata:FileBackedHTTPMetadataProvider"
 	backingFile="%{DIR}/spoolFileEntity.xml"
+    initializeFromBackupFile="false"
+    backupFileInitNextRefreshDelay="PT10S"
 	metadataURL="http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml?revision=5634&view=co"> 
 
 </metadata:MetadataProvider>

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd?rev=8192&r1=8191&r2=8192&view=diff
==============================================================================

[... 24 lines stripped ...]