[java-opensaml COMMIT] in /trunk/opensaml-saml-impl: pom.xml src/main/java/org/opensaml/saml/metadata/resolver/impl/A...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug 30 20:24:11 2013
New Revision: 3434

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3434&view=rev
Log:
Initial refactoring of HTTP metadata resolver to use Apache HttpClient v4.
Some TODO's remaining around the design differences from the v3 client.

Modified:
    trunk/opensaml-saml-impl/pom.xml
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilterTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java

Modified: trunk/opensaml-saml-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/pom.xml?rev=3434&r1=3433&r2=3434&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/pom.xml (original)
+++ trunk/opensaml-saml-impl/pom.xml Fri Aug 30 20:24:11 2013
@@ -50,19 +50,11 @@
             <groupId>org.owasp.esapi</groupId>
             <artifactId>esapi</artifactId>
         </dependency>
-        
         <dependency>
-            <!-- TODO this needs to be replaced with the v4 client -->
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+            <groupId>${httpclient.groupId}</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency> 
 
         <!-- Provided Dependencies -->
         <dependency>

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java?rev=3434&r1=3433&r2=3434&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java Fri Aug 30 20:24:11 2013
@@ -91,11 +91,7 @@
 
     /** Constructor. */
     protected AbstractReloadingMetadataResolver() {
-        super();
-        
-        setCacheSourceMetadata(true);
-        taskTimer = new Timer(true);
-        createdOwnTaskTimer = true;
+        this(null);
     }
 
     /**
@@ -109,9 +105,11 @@
         setCacheSourceMetadata(true);
         
         if (backgroundTaskTimer == null) {
-            throw new IllegalArgumentException("Task timer may not be null");
-        }
-        taskTimer = backgroundTaskTimer;
+            taskTimer = new Timer(true);
+            createdOwnTaskTimer = true;
+        } else {
+            taskTimer = backgroundTaskTimer;
+        }
     }
     
     /** {@inheritDoc} */

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java?rev=3434&r1=3433&r2=3434&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java Fri Aug 30 20:24:11 2013
@@ -24,7 +24,7 @@
 
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
-import org.apache.commons.httpclient.HttpClient;
+import org.apache.http.client.HttpClient;
 import org.opensaml.core.xml.XMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,22 +47,20 @@
 
     /** File containing the backup of the metadata. */
     private File metadataBackupFile;
-
+    
     /**
      * Constructor.
      * 
+     * @param client HTTP client used to fetch remove metadata
      * @param metadataURL the URL to fetch the metadata

[... 701 lines stripped ...]