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

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

Revision: 1885
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1885&view=rev
Author:   bradtofel
Date:     2007-07-24 17:48:56 -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/resourceindex/NutchResourceIndex.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java	2007-07-25 00:47:50 UTC (rev 1884)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java	2007-07-25 00:48:56 UTC (rev 1885)
@@ -28,7 +28,6 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.Properties;
 import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -37,7 +36,6 @@
 
 import org.archive.wayback.ResourceIndex;
 import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.PropertyConfiguration;
 import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.core.SearchResults;
 import org.archive.wayback.core.Timestamp;
@@ -63,9 +61,6 @@
 	   private static final Logger LOGGER =
 	        Logger.getLogger(NutchResourceIndex.class.getName());
 
-
-	private final static String SEARCH_BASE_URL = "resourceindex.baseurl";
-
 	private final static int MAX_RECORDS = 1000;
 	private int maxRecords = MAX_RECORDS;
 
@@ -93,17 +88,12 @@
    private static final String NUTCH_DEFAULT_HTTP_CODE = "200";
    private static final String NUTCH_DEFAULT_REDIRECT_URL = "-";
    
-
-	/* (non-Javadoc)
-	 * @see org.archive.wayback.PropertyConfigurable#init(java.util.Properties)
+	/**
+	 * @throws ConfigurationException
 	 */
-	public void init(Properties p) throws ConfigurationException {
+	public void init() throws ConfigurationException {
 		LOGGER.info("initializing NutchResourceIndex...");
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		searchUrlBase = pc.getString(SEARCH_BASE_URL);
 		LOGGER.info("Using base search url " + this.searchUrlBase);
-		maxRecords = pc.getInt(WaybackConstants.MAX_RESULTS_CONFIG_NAME,
-				MAX_RECORDS);
 
 		this.factory = DocumentBuilderFactory.newInstance();
 		this.factory.setNamespaceAware(true);
@@ -114,11 +104,7 @@
 			e.printStackTrace();
 			throw new ConfigurationException(e.getMessage());
 		}
-		if (!this.builder.isNamespaceAware()) {
-			LOGGER.severe("Builder is not namespace aware.");
-		}
 	}
-
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.ResourceIndex#query(org.archive.wayback.core.WaybackRequest)
 	 */
@@ -346,4 +332,28 @@
        d = this.builder.parse(url);
        return d;
    }
+/**
+ * @return the searchUrlBase
+ */
+public String getSearchUrlBase() {
+	return searchUrlBase;
 }
+/**
+ * @param searchUrlBase the searchUrlBase to set
+ */
+public void setSearchUrlBase(String searchUrlBase) {
+	this.searchUrlBase = searchUrlBase;
+}
+/**
+ * @return the maxRecords
+ */
+public int getMaxRecords() {
+	return maxRecords;
+}
+/**
+ * @param maxRecords the maxRecords to set
+ */
+public void setMaxRecords(int maxRecords) {
+	this.maxRecords = maxRecords;
+}
+}

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	2007-07-25 00:47:50 UTC (rev 1884)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java	2007-07-25 00:48:56 UTC (rev 1885)
@@ -26,7 +26,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Properties;
 import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -36,7 +35,6 @@
 import org.archive.wayback.ResourceIndex;
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.core.CaptureSearchResults;
-import org.archive.wayback.core.PropertyConfiguration;
 import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.core.SearchResults;
 import org.archive.wayback.core.UrlSearchResults;
@@ -83,6 +81,7 @@
 	private static final String WB_XML_ERROR_TITLE = "title";
 	private static final String WB_XML_ERROR_MESSAGE = "message";
 
+	@SuppressWarnings("unchecked")
 	private final ThreadLocal tl = new ThreadLocal() {
         protected synchronized Object initialValue() {
         	DocumentBuilder builder = null;
@@ -104,21 +103,16 @@
         return (DocumentBuilder) tl.get();
     }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.archive.wayback.PropertyConfigurable#init(java.util.Properties)
-	 */
-	public void init(Properties p) throws ConfigurationException {
+    /**
+     * @throws ConfigurationException
+     */
+    public void init() throws ConfigurationException {
 		LOGGER.info("initializing RemoteCDXIndex...");
 
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		searchUrlBase = pc.getString(SEARCH_BASE_URL);
 		this.factory = DocumentBuilderFactory.newInstance();
 		this.factory.setNamespaceAware(false);
-		LOGGER.info("Using base search url " + this.searchUrlBase);
+		LOGGER.info("Using base search url " + this.searchUrlBase);		
 	}
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -280,4 +274,18 @@
 			throws IOException, SAXException {
 		return (getDocumentBuilder()).parse(f);
 	}
+
+	/**
+	 * @return the searchUrlBase
+	 */
+	public String getSearchUrlBase() {
+		return searchUrlBase;
+	}
+
+	/**
+	 * @param searchUrlBase the searchUrlBase to set
+	 */
+	public void setSearchUrlBase(String searchUrlBase) {
+		this.searchUrlBase = searchUrlBase;
+	}
 }
\ No newline at end of file


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