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

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

Revision: 1880
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1880&view=rev
Author:   bradtofel
Date:     2007-07-24 17:43:20 -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/accesscontrol/AdministrativeExclusionAuthority.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionAuthority.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionAuthority.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionAuthority.java	2007-07-25 00:41:50 UTC (rev 1879)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionAuthority.java	2007-07-25 00:43:20 UTC (rev 1880)
@@ -24,16 +24,12 @@
  */
 package org.archive.wayback.accesscontrol;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Properties;
 
 import org.apache.commons.httpclient.URIException;
 import org.archive.wayback.bdb.BDBRecord;
 import org.archive.wayback.bdb.BDBRecordSet;
 import org.archive.wayback.bdb.BDBRecordIterator;
-import org.archive.wayback.core.PropertyConfiguration;
-import org.archive.wayback.exception.ConfigurationException;
 import org.archive.wayback.surt.SURTTokenizer;
 
 import com.sleepycat.je.DatabaseException;
@@ -47,15 +43,13 @@
  */
 public class AdministrativeExclusionAuthority implements ExclusionAuthority {
 
-
+	// TODO: read from ResounceBundle
 	private static String ADMIN_NO_ROBOTS_MSG = "Administrative Robots Ignore:";
 	private static String ADMIN_INCLUDE_MSG = "Administrative Include:";
 	private static String ADMIN_EXCLUDE_MSG = "Administrative Exclude:";
-	private static String DB_NAME = "adminexclusion.dbname";
-	private static String INDEX_PATH = "adminexclusion.dbpath";
 	
 //	RoboCache roboCache;
-	BDBRecordSet db;
+	private BDBRecordSet db = null;
 
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.accesscontrol.ExclusionAuthority#checkExclusion(java.lang.String, java.lang.String, java.lang.String)
@@ -133,27 +127,7 @@
 		rules.loadRules(encodedRules);
 		return rules;
 	}
-	/* (non-Javadoc)
-	 * @see org.archive.wayback.PropertyConfigurable#init(java.util.Properties)
-	 */
-	public void init(Properties p) throws ConfigurationException {
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		File dbDir = pc.getDir(INDEX_PATH,true);
-		String dbName = pc.getString(DB_NAME);
-		try {
 
-			db = new BDBRecordSet();
-			db.initializeDB(dbDir.getAbsolutePath(),dbName);
-
-		} catch (DatabaseException e) {
-			e.printStackTrace();
-			throw new ConfigurationException(e.getMessage());
-		}
-		
-//		roboCache = new RoboCache();
-//		roboCache.init(p);
-	}
-
 	private AdministrativeExclusionRule getRuleFor(final String surtPrefix,
 			final String dateStr) throws DatabaseException {
 		AdministrativeExclusionRules rules = new AdministrativeExclusionRules(surtPrefix);
@@ -178,4 +152,18 @@
 		rules.addRule(rule);
 		db.put(surtPrefix,rules.encodeRules());
 	}
+
+	/**
+	 * @return the db
+	 */
+	public BDBRecordSet getDb() {
+		return db;
+	}
+
+	/**
+	 * @param db the db to set
+	 */
+	public void setDb(BDBRecordSet db) {
+		this.db = db;
+	}
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionAuthority.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionAuthority.java	2007-07-25 00:41:50 UTC (rev 1879)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionAuthority.java	2007-07-25 00:43:20 UTC (rev 1880)
@@ -24,15 +24,13 @@
  */
 package org.archive.wayback.accesscontrol;
 
-import org.archive.wayback.PropertyConfigurable;
-
 /**
  *
  *
  * @author brad
  * @version $Date$, $Revision$
  */
-public interface ExclusionAuthority extends PropertyConfigurable{
+public interface ExclusionAuthority {
 	/**
 	 * determines whether userAgent can view urlString for captureDate, 
 	 * encapsulating the response in a returned ExclusionResponse object


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