[utilities COMMIT] in /java-support/trunk: pom.xml src/main/java/net/shibboleth/utilities/java/support/httpclient/Cac...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Mar  7 16:54:34 2012
New Revision: 241

URL: http://svn.shibboleth.net/view/utilities?rev=241&view=rev
Log:
Remove generic resource caching interfaces/logic
Add an HTTP in-memory and file-based caching httpclient builder

Added:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java   (with props)
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java   (with props)
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java   (with props)
Removed:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/CachingHttpResourceDecorator.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/CachingResource.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/CachingResourceDecorator.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/InMemoryResourceCache.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/ResourceCache.java
Modified:
    java-support/trunk/pom.xml
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/UriSupportTest.java

Modified: java-support/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/pom.xml?rev=241&r1=240&r2=241&view=diff
==============================================================================
--- java-support/trunk/pom.xml (original)
+++ java-support/trunk/pom.xml Wed Mar  7 16:54:34 2012
@@ -37,6 +37,12 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <!-- Required if you're using anything in the httpclient package -->
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-cache</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <!-- Required if you're using classes from the velocity package -->
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
@@ -57,7 +63,15 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java?rev=241&r1=240&r2=241&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/resource/AbstractResource.java Wed Mar  7 16:54:34 2012
@@ -22,7 +22,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractDestructableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentValidationException;
 import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
 import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
@@ -31,34 +31,10 @@
 import com.google.common.base.Objects;
 
 /** Base class for resources. */
-public abstract class AbstractResource extends AbstractInitializableComponent implements Resource {
-
-    /** Whether this resource has been destroyed. */
-    private boolean isDestroyed;
+public abstract class AbstractResource extends AbstractDestructableInitializableComponent implements Resource {
 
     /** Location of the resource. */
     private String location;
-
-    /** {@inheritDoc} */
-    public final boolean isDestroyed() {
-        return isDestroyed;
-    }
-
-    /**
-     * This implementation checks to see if the component has already been destroyed. If it has, this method simply
-     * returns. If it hasn't, this method invoked {@link #doDestroy()} and then marks the component as destroyed.
-     * 
-     * {@inheritDoc}
-     */
-    public final synchronized void destroy() {
-        if (isDestroyed) {
-            return;
-        }
-
-        doDestroy();
-
-        isDestroyed = true;
-    }
 
     /**
      * Checks whether this component is valid and ready to be used.
@@ -204,21 +180,7 @@

[... 97 lines stripped ...]