[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/saml2/metadata/provider/Abstract...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 25 23:34:07 2013
New Revision: 3240

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3240&view=rev
Log:
Port java-opensaml2 r1568.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/HTTPMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java?rev=3240&r1=3239&r2=3240&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java Mon Feb 25 23:34:07 2013
@@ -62,16 +62,16 @@
     /** Current task to refresh metadata. */
     private RefreshMetadataTask refresMetadataTask;
     
-    /** Factor used to compute when the next refresh interval will occur. Default value: {@value} */
+    /** Factor used to compute when the next refresh interval will occur. Default value: 0.75 */
     private float refreshDelayFactor = 0.75f;
 
     /**
      * Refresh interval used when metadata does not contain any validUntil or cacheDuration information. Default value:
-     * * {@value} ms
+     * 14400000ms
      */
     private long maxRefreshDelay = 14400000;
 
-    /** Floor, in milliseconds, for the refresh interval. Default value: {@value} ms */
+    /** Floor, in milliseconds, for the refresh interval. Default value: 300000ms */
     private int minRefreshDelay = 300000;
 
     /** Time when the currently cached metadata file expires. */

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProviderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProviderTest.java?rev=3240&r1=3239&r2=3240&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProviderTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProviderTest.java Mon Feb 25 23:34:07 2013
@@ -19,7 +19,6 @@
 
 import org.testng.annotations.Test;
 import org.testng.annotations.BeforeMethod;
-import org.testng.Assert;
 import org.testng.Assert;
 import java.io.File;
 import java.net.URL;
@@ -95,7 +94,7 @@
         Assert.assertEquals(descriptor2.getEntityID(), entityID2, "Entity's ID does not match requested ID");
     }
 
-    /** Tests the {@link ChainingMetadataProvider#getRole(String, javax.xml.namespace.QName) method.  */
+    /** Tests the {@link ChainingMetadataProvider#getRole(String, javax.xml.namespace.QName)} method.  */
     @Test
     public void testGetRole() throws MetadataProviderException {
         List<RoleDescriptor> roles = metadataProvider.getRole(entityID, IDPSSODescriptor.DEFAULT_ELEMENT_NAME);
@@ -107,7 +106,7 @@
         Assert.assertEquals(roles2.size(), 1, "Unexpected number of roles");
     }
 
-    /** Test the {@link ChainingMetadataProvider#getRole(String, javax.xml.namespace.QName, String) method.  */
+    /** Test the {@link ChainingMetadataProvider#getRole(String, javax.xml.namespace.QName, String)} method.  */
     @Test
     public void testGetRoleWithSupportedProtocol() throws MetadataProviderException {
         RoleDescriptor role = metadataProvider.getRole(entityID, IDPSSODescriptor.DEFAULT_ELEMENT_NAME,

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProviderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProviderTest.java?rev=3240&r1=3239&r2=3240&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProviderTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProviderTest.java Mon Feb 25 23:34:07 2013
@@ -66,7 +66,7 @@
     }
 
     /**

[... 63 lines stripped ...]