Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2232] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2008-04-11 04:07:13
|
Revision: 2232
http://archive-access.svn.sourceforge.net/archive-access/?rev=2232&view=rev
Author: bradtofel
Date: 2008-04-10 21:07:18 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
INTERFACE: added shutdown() to ResourceIndex interface, LocalResourceIndex is the only implementation that uses this at present, shutting down it's SearchResultSource
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeGroup.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeMember.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceIndex.java 2008-04-11 04:06:12 UTC (rev 2231)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceIndex.java 2008-04-11 04:07:18 UTC (rev 2232)
@@ -23,6 +23,8 @@
package org.archive.wayback;
+import java.io.IOException;
+
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.AccessControlException;
@@ -53,4 +55,6 @@
throws ResourceIndexNotAvailableException,
ResourceNotInArchiveException, BadQueryException,
AccessControlException;
+
+ public void shutdown() throws IOException;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java 2008-04-11 04:06:12 UTC (rev 2231)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java 2008-04-11 04:07:18 UTC (rev 2232)
@@ -464,4 +464,8 @@
public void setCanonicalizer(UrlCanonicalizer canonicalizer) {
this.canonicalizer = canonicalizer;
}
+
+ public void shutdown() throws IOException {
+ source.shutdown();
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java 2008-04-11 04:06:12 UTC (rev 2231)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java 2008-04-11 04:07:18 UTC (rev 2232)
@@ -287,4 +287,8 @@
public void setSearchUrlBase(String searchUrlBase) {
this.searchUrlBase = searchUrlBase;
}
+
+ public void shutdown() throws IOException {
+ // No-op
+ }
}
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java 2008-04-11 04:06:12 UTC (rev 2231)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java 2008-04-11 04:07:18 UTC (rev 2232)
@@ -248,4 +248,10 @@
public void setCanonicalizer(UrlCanonicalizer canonicalizer) {
this.canonicalizer = canonicalizer;
}
+
+ public void shutdown() throws IOException {
+ for(RangeGroup group : groups) {
+ group.shutdown();
+ }
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeGroup.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeGroup.java 2008-04-11 04:06:12 UTC (rev 2231)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeGroup.java 2008-04-11 04:07:18 UTC (rev 2232)
@@ -24,6 +24,7 @@
*/
package org.archive.wayback.resourceindex.distributed;
+import java.io.IOException;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -169,4 +170,10 @@
}
};
}
+
+ public void shutdown() throws IOException {
+ for(RangeMember member : members.values()) {
+ member.shutdown();
+ }
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeMember.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeMember.java 2008-04-11 04:06:12 UTC (rev 2231)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/RangeMember.java 2008-04-11 04:07:18 UTC (rev 2232)
@@ -24,6 +24,8 @@
*/
package org.archive.wayback.resourceindex.distributed;
+import java.io.IOException;
+
import org.archive.wayback.ResourceIndex;
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.WaybackRequest;
@@ -89,4 +91,7 @@
public void setUrlBase(String urlBase) {
index.setSearchUrlBase(urlBase);
}
+ public void shutdown() throws IOException {
+ index.shutdown();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
