Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2007-07-19 21:36:14
|
Revision: 1811
http://archive-access.svn.sourceforge.net/archive-access/?rev=1811&view=rev
Author: bradtofel
Date: 2007-07-19 13:41:26 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
FEATURE: now allows configuration of Error, CaptureResults, and UrlResults jsps via getters and setters
REFACTOR: moved code for forwarding requests to .jsps into a single method.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2007-07-19 20:39:07 UTC (rev 1810)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2007-07-19 20:41:26 UTC (rev 1811)
@@ -49,35 +49,41 @@
* @version $Date$, $Revision$
*/
public class Renderer implements QueryRenderer {
- private final static String JSP_PATH = "queryui.jsppath";
- private String jspPath = null;
-
- private final String ERROR_JSP = "ErrorResult.jsp";
-
- private final String QUERY_JSP = "QueryResults.jsp";
-
- private final String PREFIX_QUERY_JSP = "PathQueryResults.jsp";
-
+ private String templateJsp = "/index.jsp";
+ private String errorJsp = "/jsp/HTMLError.jsp";
+ private String captureJsp = "/jsp/HTMLResults.jsp";
+ private String urlJsp = "/jsp/HTMLResults.jsp";
+
public void init(Properties p) throws ConfigurationException {
PropertyConfiguration pc = new PropertyConfiguration(p);
- jspPath = pc.getString(JSP_PATH);
+// jspPath = pc.getString(JSP_PATH);
}
+ /**
+ * @param request
+ * @param response
+ * @param jspName
+ * @throws ServletException
+ * @throws IOException
+ */
+ private void proxyRequest(HttpServletRequest request,
+ HttpServletResponse response, final String jspPath)
+ throws ServletException, IOException {
+
+ RequestDispatcher dispatcher = request.getRequestDispatcher(jspPath);
+ dispatcher.forward(request, response);
+ }
+
public void renderException(HttpServletRequest httpRequest,
HttpServletResponse httpResponse, WaybackRequest wbRequest,
WaybackException exception) throws ServletException, IOException {
httpRequest.setAttribute("exception", exception);
UIResults uiResults = new UIResults(wbRequest);
- uiResults.storeInRequest(httpRequest);
+ uiResults.storeInRequest(httpRequest,errorJsp);
- String finalJspPath = jspPath + "/" + ERROR_JSP;
-
- RequestDispatcher dispatcher = httpRequest
- .getRequestDispatcher(finalJspPath);
-
- dispatcher.forward(httpRequest, httpResponse);
+ proxyRequest(httpRequest,httpResponse,errorJsp);
}
public void renderUrlResults(HttpServletRequest httpRequest,
@@ -95,8 +101,8 @@
throw new ServletException(e.getMessage());
}
- uiResults.storeInRequest(httpRequest);
- proxyRequest(httpRequest, httpResponse, QUERY_JSP);
+ uiResults.storeInRequest(httpRequest,captureJsp);
+ proxyRequest(httpRequest, httpResponse, captureJsp);
}
@@ -118,26 +124,50 @@
throw new ServletException(e.getMessage());
}
- uiResults.storeInRequest(httpRequest);
- proxyRequest(httpRequest, httpResponse, PREFIX_QUERY_JSP);
+ uiResults.storeInRequest(httpRequest,urlJsp);
+ proxyRequest(httpRequest, httpResponse, urlJsp);
}
/**
- * @param request
- * @param response
- * @param jspName
- * @throws ServletException
- * @throws IOException
+ * @return the errorJsp
*/
- private void proxyRequest(HttpServletRequest request,
- HttpServletResponse response, final String jspName)
- throws ServletException, IOException {
+ public String getErrorJsp() {
+ return errorJsp;
+ }
- String finalJspPath = jspPath + "/" + jspName;
+ /**
+ * @param errorJsp the errorJsp to set
+ */
+ public void setErrorJsp(String errorJsp) {
+ this.errorJsp = errorJsp;
+ }
- RequestDispatcher dispatcher = request
- .getRequestDispatcher(finalJspPath);
- dispatcher.forward(request, response);
+ /**
+ * @return the captureJsp
+ */
+ public String getCaptureJsp() {
+ return captureJsp;
}
+
+ /**
+ * @param captureJsp the captureJsp to set
+ */
+ public void setCaptureJsp(String captureJsp) {
+ this.captureJsp = captureJsp;
+ }
+
+ /**
+ * @return the urlJsp
+ */
+ public String getUrlJsp() {
+ return urlJsp;
+ }
+
+ /**
+ * @param urlJsp the urlJsp to set
+ */
+ public void setUrlJsp(String urlJsp) {
+ this.urlJsp = urlJsp;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-07-25 00:24:39
|
Revision: 1863
http://archive-access.svn.sourceforge.net/archive-access/?rev=1863&view=rev
Author: bradtofel
Date: 2007-07-24 17:24:42 -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/query/Renderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2007-07-25 00:24:12 UTC (rev 1862)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2007-07-25 00:24:42 UTC (rev 1863)
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.text.ParseException;
-import java.util.Properties;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -35,11 +34,9 @@
import org.archive.wayback.QueryRenderer;
import org.archive.wayback.ResultURIConverter;
-import org.archive.wayback.core.PropertyConfiguration;
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.UIResults;
import org.archive.wayback.core.WaybackRequest;
-import org.archive.wayback.exception.ConfigurationException;
import org.archive.wayback.exception.WaybackException;
/**
@@ -50,16 +47,10 @@
*/
public class Renderer implements QueryRenderer {
- private String templateJsp = "/index.jsp";
private String errorJsp = "/jsp/HTMLError.jsp";
private String captureJsp = "/jsp/HTMLResults.jsp";
private String urlJsp = "/jsp/HTMLResults.jsp";
- public void init(Properties p) throws ConfigurationException {
- PropertyConfiguration pc = new PropertyConfiguration(p);
-// jspPath = pc.getString(JSP_PATH);
- }
-
/**
* @param request
* @param response
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-08-18 00:57:09
|
Revision: 1907
http://archive-access.svn.sourceforge.net/archive-access/?rev=1907&view=rev
Author: bradtofel
Date: 2007-08-17 17:56:22 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
FEATURE: now uses XML jsp's if the WaybackRequest indicates XML data is desired.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2007-08-18 00:54:08 UTC (rev 1906)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2007-08-18 00:56:22 UTC (rev 1907)
@@ -25,7 +25,6 @@
package org.archive.wayback.query;
import java.io.IOException;
-import java.text.ParseException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -34,6 +33,7 @@
import org.archive.wayback.QueryRenderer;
import org.archive.wayback.ResultURIConverter;
+import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.UIResults;
import org.archive.wayback.core.WaybackRequest;
@@ -48,8 +48,10 @@
public class Renderer implements QueryRenderer {
private String errorJsp = "/jsp/HTMLError.jsp";
+ private String xmlErrorJsp = "/jsp/XMLError.jsp";
private String captureJsp = "/jsp/HTMLResults.jsp";
private String urlJsp = "/jsp/HTMLResults.jsp";
+ private String xmlJsp = "/jsp/XMLResults.jsp";
/**
* @param request
@@ -72,9 +74,13 @@
httpRequest.setAttribute("exception", exception);
UIResults uiResults = new UIResults(wbRequest);
- uiResults.storeInRequest(httpRequest,errorJsp);
+ String jsp = errorJsp;
+ if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+ jsp = xmlErrorJsp;
+ }
+ uiResults.storeInRequest(httpRequest,jsp);
- proxyRequest(httpRequest,httpResponse,errorJsp);
+ proxyRequest(httpRequest,httpResponse,jsp);
}
public void renderUrlResults(HttpServletRequest httpRequest,
@@ -82,18 +88,15 @@
SearchResults results, ResultURIConverter uriConverter)
throws ServletException, IOException {
- UIQueryResults uiResults;
- try {
- uiResults = new UIQueryResults(httpRequest, wbRequest, results,
- uriConverter);
- } catch (ParseException e) {
- // I don't think this should happen...
- e.printStackTrace();
- throw new ServletException(e.getMessage());
+ UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
+ results, uriConverter);
+ String jsp = captureJsp;
+ if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+ jsp = xmlJsp;
}
- uiResults.storeInRequest(httpRequest,captureJsp);
- proxyRequest(httpRequest, httpResponse, captureJsp);
+ uiResults.storeInRequest(httpRequest,jsp);
+ proxyRequest(httpRequest, httpResponse, jsp);
}
@@ -105,18 +108,15 @@
SearchResults results, ResultURIConverter uriConverter)
throws ServletException, IOException {
- UIQueryResults uiResults;
- try {
- uiResults = new UIQueryResults(httpRequest, wbRequest, results,
- uriConverter);
- } catch (ParseException e) {
- // I don't think this should happen...
- e.printStackTrace();
- throw new ServletException(e.getMessage());
+ UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
+ results, uriConverter);
+ String jsp = urlJsp;
+ if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+ jsp = xmlJsp;
}
- uiResults.storeInRequest(httpRequest,urlJsp);
- proxyRequest(httpRequest, httpResponse, urlJsp);
+ uiResults.storeInRequest(httpRequest,jsp);
+ proxyRequest(httpRequest, httpResponse, jsp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-07-01 23:40:09
|
Revision: 2368
http://archive-access.svn.sourceforge.net/archive-access/?rev=2368&view=rev
Author: bradtofel
Date: 2008-07-01 16:40:18 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult
INTERFACE: changed names of two render* methods to match Capture/Url scheme.
TWEAK: Moved query specific .jsps to /query/ directory in webapp
TWEAK: allow separate XML renderers for Url/Capture results.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2008-07-01 23:38:20 UTC (rev 2367)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2008-07-01 23:40:18 UTC (rev 2368)
@@ -34,7 +34,8 @@
import org.archive.wayback.QueryRenderer;
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResults;
+import org.archive.wayback.core.UrlSearchResults;
import org.archive.wayback.core.WaybackRequest;
/**
@@ -47,9 +48,10 @@
*/
public class Renderer implements QueryRenderer {
- private String captureJsp = "/jsp/HTMLResults.jsp";
- private String urlJsp = "/jsp/HTMLResults.jsp";
- private String xmlJsp = "/jsp/XMLResults.jsp";
+ private String captureJsp = "/query/HTMLCaptureResults.jsp";
+ private String urlJsp = "/query/HTMLUrlResults.jsp";
+ private String xmlCaptureJsp = "/query/XMLCaptureResults.jsp";
+ private String xmlUrlJsp = "/query/XMLUrlResults.jsp";
/**
* @param request
@@ -66,16 +68,16 @@
dispatcher.forward(request, response);
}
- public void renderUrlResults(HttpServletRequest httpRequest,
+ public void renderCaptureResults(HttpServletRequest httpRequest,
HttpServletResponse httpResponse, WaybackRequest wbRequest,
- SearchResults results, ResultURIConverter uriConverter)
+ CaptureSearchResults results, ResultURIConverter uriConverter)
throws ServletException, IOException {
- UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
+ UICaptureQueryResults uiResults = new UICaptureQueryResults(httpRequest, wbRequest,
results, uriConverter);
String jsp = captureJsp;
if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
- jsp = xmlJsp;
+ jsp = xmlCaptureJsp;
}
uiResults.storeInRequest(httpRequest,jsp);
@@ -86,16 +88,16 @@
/* (non-Javadoc)
* @see org.archive.wayback.QueryRenderer#renderUrlPrefixResults(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.archive.wayback.core.WaybackRequest, org.archive.wayback.core.SearchResults, org.archive.wayback.ResultURIConverter)
*/
- public void renderUrlPrefixResults(HttpServletRequest httpRequest,
+ public void renderUrlResults(HttpServletRequest httpRequest,
HttpServletResponse httpResponse, WaybackRequest wbRequest,
- SearchResults results, ResultURIConverter uriConverter)
+ UrlSearchResults results, ResultURIConverter uriConverter)
throws ServletException, IOException {
- UIQueryResults uiResults = new UIQueryResults(httpRequest, wbRequest,
+ UIUrlQueryResults uiResults = new UIUrlQueryResults(httpRequest, wbRequest,
results, uriConverter);
String jsp = urlJsp;
if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
- jsp = xmlJsp;
+ jsp = xmlUrlJsp;
}
uiResults.storeInRequest(httpRequest,jsp);
@@ -132,16 +134,29 @@
}
/**
- * @return the xmlJsp
+ * @return the xmlCaptureJsp
*/
- public String getXmlJsp() {
- return xmlJsp;
+ public String getXmlCaptureJsp() {
+ return xmlCaptureJsp;
}
/**
- * @param xmlJsp the xmlJsp to set
+ * @param xmlCaptureJsp the xmlCaptureJsp to set
*/
- public void setXmlJsp(String xmlJsp) {
- this.xmlJsp = xmlJsp;
+ public void setXmlCaptureJsp(String xmlCaptureJsp) {
+ this.xmlCaptureJsp = xmlCaptureJsp;
}
+ /**
+ * @return the xmlUrlJsp
+ */
+ public String getXmlUrlJsp() {
+ return xmlUrlJsp;
+ }
+
+ /**
+ * @param xmlUrlJsp the xmlUrlJsp to set
+ */
+ public void setXmlUrlJsp(String xmlUrlJsp) {
+ this.xmlUrlJsp = xmlUrlJsp;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X