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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jan 16 07:21:28 2014
New Revision: 3560

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3560&view=rev
Log:
IDP-308 Resource refactoring

ShibbolethResource is renamed Resource and has one method name change to allow calsses to implement both it and Spring.io.Resource.

ShibbolethResourceHelper is renamed ResourceHelper

All vestiges of Resource implementation have been removed from Java-support.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java?rev=3560&r1=3559&r2=3560&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java Thu Jan 16 07:21:28 2014
@@ -21,14 +21,14 @@
 import java.util.Timer;
 
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.resource.ShibbolethResource;
+import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A metadata provider that reads metadata from a {#link {@link ShibbolethResource}.
+ * A metadata provider that reads metadata from a {#link {@link Resource}.
  * 
  * @since 2.2
  */
@@ -38,7 +38,7 @@
     private final Logger log = LoggerFactory.getLogger(ResourceBackedMetadataResolver.class);
 
     /** Resource from which metadata is read. */
-    private ShibbolethResource metadataResource;
+    private Resource metadataResource;
 
 
     /**
@@ -53,7 +53,7 @@
      * 
      * @deprecated
      */
-    public ResourceBackedMetadataResolver(ShibbolethResource resource, Timer timer, long maxMetadataCacheDuration)
+    public ResourceBackedMetadataResolver(Resource resource, Timer timer, long maxMetadataCacheDuration)
             throws ResolverException {
         super(timer);
 
@@ -75,7 +75,7 @@
      * 
      * @throws IOException thrown if there is a problem retrieving information about the resource
      */
-    public ResourceBackedMetadataResolver(Timer timer, ShibbolethResource resource) throws IOException {
+    public ResourceBackedMetadataResolver(Timer timer, Resource resource) throws IOException {
         super(timer);
 
         if (!resource.exists()) {

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java?rev=3560&r1=3559&r2=3560&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java Thu Jan 16 07:21:28 2014
@@ -21,10 +21,10 @@
 import java.net.URL;
 import java.util.Timer;
 
-import net.shibboleth.ext.spring.resource.ShibbolethResourceHelper;
+import net.shibboleth.ext.spring.resource.ResourceHelper;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.resource.ShibbolethResource;
+import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
@@ -51,7 +51,7 @@
 
         URL mdURL = ResourceBackedMetadataResolverTest.class
                 .getResource("/data/org/opensaml/saml/saml2/metadata/InCommon-metadata.xml");
-        ShibbolethResource mdResource = ShibbolethResourceHelper.of(new FileSystemResource(new File(mdURL.toURI()).getAbsolutePath()));
+        Resource mdResource = ResourceHelper.of(new FileSystemResource(new File(mdURL.toURI()).getAbsolutePath()));
 
         metadataProvider = new ResourceBackedMetadataResolver(new Timer(), mdResource);
         metadataProvider.setParserPool(parserPool);