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

[<ikr...@us...>]

Revision: 3619
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3619&view=rev
Author:   ikreymer
Date:     2012-02-21 20:51:08 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
FIX: Moving accessPointPath from AccessPoint to AbstractRequestHandler to enable setting custom accessPointPath for other handlers (such as LiveWebAccessPoint)

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java	2012-02-21 04:05:39 UTC (rev 3618)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java	2012-02-21 20:51:08 UTC (rev 3619)
@@ -37,6 +37,7 @@
  */
 public abstract class AbstractRequestHandler implements RequestHandler {
 	private String beanName = null;
+	private String accessPointPath = null;
 	private ServletContext servletContext = null;
 
 	public void setBeanName(final String beanName) {
@@ -45,7 +46,15 @@
 	public String getBeanName() {
 		return beanName;
 	}
+	
+	public String getAccessPointPath() {
+		return accessPointPath;
+	}
 
+	public void setAccessPointPath(String accessPointPath) {
+		this.accessPointPath = accessPointPath;
+	}
+
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java	2012-02-21 04:05:39 UTC (rev 3618)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java	2012-02-21 20:51:08 UTC (rev 3619)
@@ -23,8 +23,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.archive.wayback.webapp.AccessPoint;
-
 /**
  * Helper static methods to implement registration of a RequestHandler with a
  * RequestMapper, based on the beanName() method.
@@ -133,8 +131,8 @@
 		
 		String name = null;
 		
-		if (handler instanceof AccessPoint) {
-			name = ((AccessPoint)handler).getAccessPointPath();
+		if (handler instanceof AbstractRequestHandler) {
+			name = ((AbstractRequestHandler)handler).getAccessPointPath();
 		}
 		
 		if (name == null) {

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2012-02-21 04:05:39 UTC (rev 3618)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2012-02-21 20:51:08 UTC (rev 3619)
@@ -132,8 +132,6 @@
 	private BooleanOperator<WaybackRequest> authentication = null;
 	private long embargoMS = 0;
 	private CustomResultFilterFactory filterFactory = null;
-	
-	private String accessPointPath = null;
 
 	public void init() {
 		checkAccessPointAware(collection,exception,query,parser,replay,
@@ -966,12 +964,4 @@
 	public CustomResultFilterFactory getFilterFactory() {
 		return filterFactory;
 	}
-
-	public String getAccessPointPath() {
-		return accessPointPath;
-	}
-
-	public void setAccessPointPath(String accessPointPath) {
-		this.accessPointPath = accessPointPath;
-	}
 }

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