[Archive-access-cvs] SF.net SVN: archive-access: [1870] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourcestore

[<bra...@us...>]

Revision: 1870
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1870&view=rev
Author:   bradtofel
Date:     2007-07-24 17:33:21 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
REFACTOR: removed all references to PropertyConfigurable interface

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java	2007-07-25 00:32:35 UTC (rev 1869)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java	2007-07-25 00:33:21 UTC (rev 1870)
@@ -26,7 +26,6 @@
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Properties;
 
 import org.archive.io.ArchiveRecord;
 import org.archive.io.arc.ARCReader;
@@ -34,10 +33,8 @@
 import org.archive.io.arc.ARCRecord;
 import org.archive.wayback.ResourceStore;
 import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.PropertyConfiguration;
 import org.archive.wayback.core.Resource;
 import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.exception.ConfigurationException;
 import org.archive.wayback.exception.ResourceNotAvailableException;
 
 
@@ -51,17 +48,9 @@
  * @version $Date$, $Revision$
  */
 public class HttpARCResourceStore implements ResourceStore {
-	private static final String ARC_URL_PREFIX = "resourcestore.arcurlprefix";
 
 	private String urlPrefix = null;
 
-	public void init(Properties p) throws ConfigurationException {
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		urlPrefix = pc.getString(ARC_URL_PREFIX);
-		if(!urlPrefix.endsWith("/")) {
-			urlPrefix = urlPrefix + "/";
-		}
-	}
 
 	public Resource retrieveResource(SearchResult result) throws IOException, 
 		ResourceNotAvailableException {
@@ -99,4 +88,18 @@
 		}
 		return r;
 	}
+
+	/**
+	 * @return the urlPrefix
+	 */
+	public String getUrlPrefix() {
+		return urlPrefix;
+	}
+
+	/**
+	 * @param urlPrefix the urlPrefix to set
+	 */
+	public void setUrlPrefix(String urlPrefix) {
+		this.urlPrefix = urlPrefix;
+	}
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java	2007-07-25 00:32:35 UTC (rev 1869)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java	2007-07-25 00:33:21 UTC (rev 1870)
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.HashMap;
-import java.util.Properties;
 import java.util.logging.Logger;
 
 import org.apache.commons.httpclient.HttpException;
@@ -38,7 +37,6 @@
 import org.archive.io.arc.ARCRecord;
 import org.archive.wayback.ResourceStore;
 import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.PropertyConfiguration;
 import org.archive.wayback.core.Resource;
 import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.core.SearchResults;
@@ -58,13 +56,6 @@
         Logger.getLogger(LocalARCResourceStore.class.getName());
 
 	private final static int DEFAULT_RUN_INTERVAL_MS = 10000;
-	private static final String RESOURCE_PATH = "resourcestore.arcpath";
-	private static final String AUTO_INDEX = "resourcestore.autoindex";
-	private static final String TMP_PATH = "resourcestore.tmppath";
-	private static final String WORK_PATH = "resourcestore.workpath";
-	private static final String QUEUED_PATH = "resourcestore.queuedpath";
-	private static final String INDEX_TARGET = "resourcestore.indextarget";
-	private static final String INDEX_INTERVAL = "resourcestore.indexinterval";
 
 	private File arcDir = null;
 	private File tmpDir = null;
@@ -81,24 +72,6 @@
 	 */
 	private static Thread indexThread = null;
 	
-	public void init(Properties p) throws ConfigurationException {
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		arcDir = pc.getDir(RESOURCE_PATH, true);
-		String autoIndex = p.getProperty(AUTO_INDEX);
-		if((autoIndex != null) && (autoIndex.compareTo("1") == 0)) {
-			tmpDir = pc.getDir(TMP_PATH,true);
-			workDir = pc.getDir(WORK_PATH,true);
-			queuedDir = pc.getDir(QUEUED_PATH,true);
-			indexTarget = pc.getString(INDEX_TARGET);
-			
-			if(indexTarget.startsWith("http://")) {
-				indexClient = new IndexClient(indexTarget);
-			}
-			runInterval = pc.getInt(INDEX_INTERVAL,DEFAULT_RUN_INTERVAL_MS);
-			startAutoIndexThread();
-		}
-	}
-
 	/**
 	 * @throws ConfigurationException
 	 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.