Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [1850] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/accesscontrol
|
From: <bra...@us...> - 2007-07-20 01:24:28
|
Revision: 1850
http://archive-access.svn.sourceforge.net/archive-access/?rev=1850&view=rev
Author: bradtofel
Date: 2007-07-19 18:24:30 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
REFACTOR: changed base class from WaybackServlet to org.archive.wayback.webapp.ServletRequestContext, and added getter/setter for Spring configuration
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionServlet.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionServlet.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionServlet.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionServlet.java 2007-07-20 01:24:06 UTC (rev 1849)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/AdministrativeExclusionServlet.java 2007-07-20 01:24:30 UTC (rev 1850)
@@ -37,9 +37,8 @@
import org.apache.commons.httpclient.URIException;
import org.archive.wayback.core.Timestamp;
-import org.archive.wayback.core.WaybackServlet;
-import org.archive.wayback.exception.ConfigurationException;
import org.archive.wayback.surt.SURTTokenizer;
+import org.archive.wayback.webapp.ServletRequestContext;
import com.sleepycat.je.DatabaseException;
@@ -55,9 +54,8 @@
* @author brad
* @version $Date$, $Revision$
*/
-public class AdministrativeExclusionServlet extends WaybackServlet {
+public class AdministrativeExclusionServlet extends ServletRequestContext {
- private static String ADMIN_EXCLUSION_AUTH_CLASSNAME = "exclusionauthority";
private static final String DEFAULT_USER_AGENT = "ia_archiver";
private static final String HTML_BR = "<br></br>";
private static final long serialVersionUID = 1L;
@@ -102,25 +100,8 @@
private static final int RULE_STATUS_INACTIVE = 1;
private static final int RULE_STATUS_DELETE = 2;
+ private AdministrativeExclusionAuthority exclusionAuthority = null;
- /**
- * possibly initializes and returns the queryRenderer
- *
- * @return Returns the RoboCache.
- * @throws ServletException
- */
- public AdministrativeExclusionAuthority getExclusionAuthority()
- throws ServletException {
- try {
- // TODO: verify type
- return (AdministrativeExclusionAuthority) wayback
- .getCachedInstance(ADMIN_EXCLUSION_AUTH_CLASSNAME);
- } catch (ConfigurationException e) {
- e.printStackTrace();
- throw new ServletException(e);
- }
- }
-
private void showPage(HttpServletResponse response, StringBuilder page)
throws IOException {
response.setContentType("text/html");
@@ -131,14 +112,15 @@
return e.getMessage();
}
- public void doGet(HttpServletRequest httpRequest,
- HttpServletResponse httpResponse) throws IOException,
- ServletException {
- AdministrativeExclusionAuthority exclAuth = getExclusionAuthority();
+ public boolean handleRequest(HttpServletRequest httpRequest,
+ HttpServletResponse httpResponse) throws ServletException,
+ IOException {
+ AdministrativeExclusionAuthority exclAuth = exclusionAuthority;
StringBuilder page = new StringBuilder(1024);
page.append("<html><head><title>Wayback: Administrative Exclusions</title></head><body>");
- Map queryArgs = httpRequest.getParameterMap();
+ @SuppressWarnings("unchecked")
+ Map<String,String[]> queryArgs = httpRequest.getParameterMap();
String operation = getMapParam(queryArgs,FORM_OPERATION);
if(operation == null) {
page.append(makeCheckForm(queryArgs));
@@ -174,25 +156,10 @@
}
page.append(makeQueryForm(queryArgs));
page.append(makeCreateForm(queryArgs));
+
+ } else if((operation.equals(MODIFY_FORM_OPERATION)
+ || operation.equals(DELETE_FORM_OPERATION))) {
- } else {
- page.append("GET request cannot change database");
- }
- page.append("</body></html>");
- showPage(httpResponse,page);
- }
- public void doPost(HttpServletRequest httpRequest,
- HttpServletResponse httpResponse) throws IOException,
- ServletException {
- AdministrativeExclusionAuthority exclAuth = getExclusionAuthority();
- Map queryArgs = httpRequest.getParameterMap();
- String operation = getMapParam(queryArgs,FORM_OPERATION);
- StringBuilder page = new StringBuilder(1024);
- page.append("<html><head><title>Wayback: Administrative Exclusions</title></head><body>");
- page.append(makeCheckForm(queryArgs));
- page.append(makeQueryForm(queryArgs));
- page.append(makeCreateForm(queryArgs));
- if(operation != null && (operation.equals(MODIFY_FORM_OPERATION) || operation.equals(DELETE_FORM_OPERATION))) {
try {
handleRuleCreate(exclAuth,queryArgs);
page.append("OK - added rule");
@@ -206,12 +173,15 @@
e.printStackTrace();
page.append(formatException(e));
}
+
+ } else {
+ page.append("Unknown operation");
}
page.append("</body></html>");
showPage(httpResponse,page);
+ return true;
}
-
-
+
// HTML GENERATION METHODS:
private String htmlEncode(String orig) {
@@ -221,7 +191,8 @@
return orig;
}
- private String makeFormTextInput(String label, String name, Map queryArgs,
+ private String makeFormTextInput(String label, String name,
+ Map<String,String[]> queryArgs,
String suffix) {
String value = "";
if(queryArgs != null) {
@@ -231,7 +202,7 @@
value + "\"></input>" + suffix;
}
private String makeFormTextAreaInput(String label, String name,
- Map queryArgs, String suffix) {
+ Map<String,String[]> queryArgs, String suffix) {
String value = "";
if(queryArgs != null) {
value = htmlEncode(getMapParamOrEmpty(queryArgs,name));
@@ -241,7 +212,7 @@
}
private String makeFormCheckInput(String label, String name, String value,
- Map queryArgs, String suffix) {
+ Map<String,String[]> queryArgs, String suffix) {
String curValue = getMapParam(queryArgs,name);
String checked = "";
if(curValue != null && curValue.equals(value)) {
@@ -274,14 +245,14 @@
// CHECK FORM AND HANDLING
- private String makeCheckForm(Map queryArgs) {
+ private String makeCheckForm(Map<String,String[]> queryArgs) {
String content = makeFormTextInput("Url",CHECK_FORM_URL,queryArgs," ") +
makeFormTextInput("Timestamp",CHECK_FORM_TIMESTAMP,queryArgs," ");
return makeHeaderForm("Test Exclusion","GET",CHECK_FORM_OPERATION,content);
}
private String handleRuleCheck(AdministrativeExclusionAuthority excl,
- Map queryArgs) throws Exception {
+ Map<String,String[]> queryArgs) throws Exception {
String url = getRequiredMapParam(queryArgs,CHECK_FORM_URL);
String timestamp = getRequiredMapParam(queryArgs,CHECK_FORM_TIMESTAMP);
String userAgent = DEFAULT_USER_AGENT;
@@ -292,7 +263,7 @@
// RULE QUERY FORM AND HANDLING
- private String makeQueryForm(Map queryArgs) {
+ private String makeQueryForm(Map<String,String[]> queryArgs) {
StringBuilder content = new StringBuilder(1024);
content.append(makeFormTextInput("Url",QUERY_FORM_URL,queryArgs,""));
content.append(makeFormCheckInput("all",QUERY_FORM_ALL,QUERY_FORM_ALL_VALUE,queryArgs,""));
@@ -300,12 +271,13 @@
}
private String handleRuleQuery(AdministrativeExclusionAuthority excl,
- Map queryArgs) throws ParseException, URIException, DatabaseException {
+ Map<String,String[]> queryArgs) throws ParseException, URIException,
+ DatabaseException {
String url = getRequiredMapParam(queryArgs,QUERY_FORM_URL);
String all = getMapParam(queryArgs,QUERY_FORM_ALL);
boolean showAll = (all != null && all.equals(QUERY_FORM_ALL_VALUE));
String surt = SURTTokenizer.prefixKey(url);
- ArrayList matching = excl.matchRules(surt);
+ ArrayList<AdministrativeExclusionRules> matching = excl.matchRules(surt);
StringBuilder matchHTML = new StringBuilder();
rulesToTable(matchHTML,matching,url,showAll);
return matchHTML.toString();
@@ -339,7 +311,7 @@
return makeForm("POST", DELETE_FORM_OPERATION, sb.toString());
}
- private String makeCreateForm(Map queryArgs) {
+ private String makeCreateForm(Map<String,String[]> queryArgs) {
StringBuilder sb = new StringBuilder(1024);
sb.append(makeFormTextInput("Url",MODIFY_FORM_URL,queryArgs,""));
sb.append(makeFormCheckInput("(prefix)",MODIFY_FORM_PREFIX,
@@ -369,7 +341,7 @@
}
private void handleRuleCreate(AdministrativeExclusionAuthority auth,
- Map queryMap) throws ParseException, URIException, DatabaseException {
+ Map<String,String[]> queryMap) throws ParseException, URIException, DatabaseException {
AdministrativeExclusionRule rule = new AdministrativeExclusionRule();
@@ -443,7 +415,8 @@
String key = rule.key();
boolean deleted = false;
- Iterator itr = rules.getRules().iterator();
+ Iterator<AdministrativeExclusionRule> itr =
+ rules.getRules().iterator();
while(itr.hasNext()) {
AdministrativeExclusionRule daRule =
(AdministrativeExclusionRule) itr.next();
@@ -519,19 +492,19 @@
page.append("</tr>\n");
}
- private void rulesToTable(StringBuilder page,ArrayList matching,
- String url, boolean showAll) {
+ private void rulesToTable(StringBuilder page,
+ ArrayList<AdministrativeExclusionRules> matching, String url,
+ boolean showAll) {
if(matching.size() > 0) {
page.append("<table border=1>");
ruleHeaderRow(page);
- Iterator itr = matching.iterator();
+ Iterator<AdministrativeExclusionRules> itr = matching.iterator();
while(itr.hasNext()) {
- AdministrativeExclusionRules rules =
- (AdministrativeExclusionRules) itr.next();
+ AdministrativeExclusionRules rules = itr.next();
String surtPrefix = rules.getSurtPrefix();
- Iterator ruleItr = null;
+ Iterator<AdministrativeExclusionRule> ruleItr = null;
if(showAll) {
ruleItr = rules.getRules().iterator();
} else {
@@ -549,6 +522,4 @@
page.append("<p>No records match("+url+")</p>\n");
}
}
-
-
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionServlet.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionServlet.java 2007-07-20 01:24:06 UTC (rev 1849)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionServlet.java 2007-07-20 01:24:30 UTC (rev 1850)
@@ -27,13 +27,11 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
-//import java.util.logging.Logger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.archive.wayback.core.WaybackServlet;
-import org.archive.wayback.exception.ConfigurationException;
+import org.archive.wayback.webapp.ServletRequestContext;
/**
*
@@ -41,15 +39,9 @@
* @author brad
* @version $Date$, $Revision$
*/
-public class ExclusionServlet extends WaybackServlet {
+public class ExclusionServlet extends ServletRequestContext {
private static final long serialVersionUID = 1L;
-// private static final Logger LOGGER = Logger
-// .getLogger(ExclusionServlet.class.getName());
-
- private final static String EXCLUSION_AUTHORITY_CLASSNAME =
- "exclusionauthority";
-
private static final String OPERATION_ARGUMENT = "operation";
private static final String URL_ARGUMENT = "url";
@@ -60,30 +52,17 @@
private static final String OPERATION_CHECK = "check";
+ private ExclusionAuthority exclusionAuthority = null;
// private static final String OPERATION_PURGE = "purge";
- /**
- * possibly initializes and returns the ExclusionAuthority
- *
- * @return Returns the RoboCache.
- * @throws ServletException
- */
- public ExclusionAuthority getExclusionAuthority() throws ServletException {
- try {
- return (ExclusionAuthority) wayback
- .getCachedInstance(EXCLUSION_AUTHORITY_CLASSNAME);
- } catch (ConfigurationException e) {
- e.printStackTrace();
- throw new ServletException(e);
- }
- }
- public void doGet(HttpServletRequest httpRequest,
+ public boolean handleRequest(HttpServletRequest httpRequest,
HttpServletResponse httpResponse) throws IOException,
ServletException {
- ExclusionAuthority exclAuth = getExclusionAuthority();
+ ExclusionAuthority exclAuth = exclusionAuthority;
- Map queryArgs = httpRequest.getParameterMap();
+ @SuppressWarnings("unchecked")
+ Map<String,String[]> queryArgs = httpRequest.getParameterMap();
String url = getMapParam(queryArgs, URL_ARGUMENT);
String operation = getMapParam(queryArgs, OPERATION_ARGUMENT);
String userAgent = getMapParam(queryArgs, USER_AGENT_ARGUMENT);
@@ -139,5 +118,20 @@
httpResponse.setContentType(eclResponse.getContentType());
OutputStream os = httpResponse.getOutputStream();
eclResponse.writeResponse(os);
+ return true;
}
+
+ /**
+ * @param exclusionAuthority the exclusionAuthority to set
+ */
+ public void setExclusionAuthority(ExclusionAuthority exclusionAuthority) {
+ this.exclusionAuthority = exclusionAuthority;
+ }
+
+ /**
+ * @return the exclusionAuthority
+ */
+ public ExclusionAuthority getExclusionAuthority() {
+ return exclusionAuthority;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
