Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2007-07-19 21:27:30
|
Revision: 1836
http://archive-access.svn.sourceforge.net/archive-access/?rev=1836&view=rev
Author: bradtofel
Date: 2007-07-19 14:27:31 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
INITIAL-REV: first example Spring configuration, which has an archivalUrl and an XML query interface. Needs documentation and more configuration examples.
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-07-19 21:27:31 UTC (rev 1836)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="bdbsearchresultsource"
+ class="org.archive.wayback.resourceindex.bdb.BDBIndex"
+ init-method="init">
+ <property name="bdbName" value="DB1" />
+ <property name="bdbPath" value="/tmp/wayback/index/" />
+ </bean>
+
+ <bean id="cdxsearchresultsource" class="org.archive.wayback.resourceindex.cdx.CDXIndex">
+ <property name="path" value="/tmp/wayback/cdx-index/index.cdx" />
+ </bean>
+
+ <bean id="compositecdxresultsource" class="org.archive.wayback.resourceindex.CompositeSearchResultSource">
+ <property name="CDXSources">
+ <list>
+ <value>/tmp/wayback/cdx-index/index.cdx.1</value>
+ <value>/tmp/wayback/cdx-index/index.cdx.2</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="localbdbindex" class="org.archive.wayback.resourceindex.LocalResourceIndex">
+ <property name="source" ref="bdbsearchresultsource" />
+ <property name="maxRecords" value="10000" />
+ </bean>
+ <bean id="localcdxindex" class="org.archive.wayback.resourceindex.LocalResourceIndex">
+ <property name="source" ref="cdxsearchresultsource" />
+ <property name="maxRecords" value="10000" />
+ </bean>
+
+ <bean id="localstore" class="org.archive.wayback.resourcestore.LocalARCResourceStore">
+ <property name="arcDir" value="/tmp/wayback/arcs/" />
+ </bean>
+
+ <bean id="standardquery" class="org.archive.wayback.query.Renderer">
+ </bean>
+ <bean id="calendarquery" class="org.archive.wayback.query.Renderer">
+ </bean>
+ <bean id="xmlquery" class="org.archive.wayback.query.Renderer">
+ <property name="captureJsp" value="/jsp/XMLResults.jsp" />
+ <property name="urlJsp" value="/jsp/XMLResults.jsp" />
+ <property name="errorJsp" value="/jsp/XMLError.jsp" />
+ </bean>
+
+
+ <bean id="archivalurlreplay" class="org.archive.wayback.archivalurl.JSReplayRenderer">
+ <property name="JSInserts">
+ <list>
+ <value>http://localhost:8080/wm.js</value>
+ </list>
+ </property>
+ </bean>
+ <bean id="archivalurluriconverter"
+ class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/wayback/" />
+ </bean>
+ <bean id="archivalurlparser" class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser" init-method="init">
+ <property name="maxRecords" value="1000" />
+ </bean>
+
+
+ <bean id="proxyreplay" class="org.archive.wayback.proxy.RawReplayRenderer">
+ </bean>
+ <bean id="proxyuriconverter" class="org.archive.wayback.proxy.RedirectResultURIConverter">
+ <property name="redirectURI" value="http://localhost:8090/jsp/QueryUI/Redirect.jsp" />
+ </bean>
+ <bean id="proxyparser" class="org.archive.wayback.proxy.ProxyRequestParser" init-method="init">
+ <property name="maxRecords" value="1000" />
+ </bean>
+
+
+ <bean id="archivalcontext" abstract="true"
+ class="org.archive.wayback.webapp.WaybackContext">
+ <property name="index" ref="localbdbindex" />
+ <property name="store" ref="localstore" />
+ <property name="query" ref="standardquery" />
+ <property name="replay" ref="archivalurlreplay" />
+ <property name="parser" ref="archivalurlparser" />
+ <property name="uriConverter" ref="archivalurluriconverter" />
+ </bean>
+
+ <bean name="8080:wayback" class="org.archive.wayback.webapp.WaybackContext">
+ <property name="configs">
+ <props>
+ <prop key="key1">key1-value</prop>
+ <prop key="key2">key2-value</prop>
+ </props>
+ </property>
+ <property name="index">
+ <bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
+ <property name="source">
+ <bean class="org.archive.wayback.resourceindex.bdb.BDBIndex"
+ init-method="init">
+ <property name="bdbName" value="DB1" />
+ <property name="bdbPath" value="/tmp/wayback/index/" />
+ <property name="updater">
+ <bean class="org.archive.wayback.resourceindex.bdb.BDBIndexUpdater">
+ <property name="incoming" value="/tmp/wayback/index-data/incoming/" />
+ <property name="failed" value="/tmp/wayback/index-data/failed/" />
+ <property name="merged" value="/tmp/wayback/index-data/merged/" />
+ <property name="runInterval" value="10000" />
+ </bean>
+ </property>
+ </bean>
+ </property>
+ <property name="maxRecords" value="10000" />
+ </bean>
+ </property>
+
+ <property name="store">
+ <bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
+ init-method="init">
+ <property name="arcDir" value="/tmp/wayback/arcs/" />
+ <property name="queuedDir" value="/tmp/wayback/arc-indexer/queued" />
+ <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
+ <property name="workDir" value="/tmp/wayback/arc-indexer/work" />
+ <property name="indexTarget" value="/tmp/wayback/index-data/incoming" />
+ <property name="runInterval" value="10000" />
+ </bean>
+ </property>
+
+ <property name="query">
+ <bean class="org.archive.wayback.query.Renderer">
+ <property name="captureJsp" value="/jsp/HTMLResults.jsp" />
+ </bean>
+ </property>
+
+ <property name="replay">
+ <bean class="org.archive.wayback.archivalurl.JSReplayRenderer">
+ <property name="JSInserts">
+ <list>
+ <value>http://localhost:8080/wm.js</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+
+ <property name="parser">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser"
+ init-method="init">
+ <property name="maxRecords" value="1000" />
+ </bean>
+ </property>
+
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/wayback/" />
+ </bean>
+ </property>
+ </bean>
+
+
+ <bean name="8080:wayback-xml" parent="8080:wayback">
+ <property name="configs">
+ <props>
+ <prop key="key1">xml-key1-value</prop>
+ <prop key="key2">xml-key2-value</prop>
+ </props>
+ </property>
+ <property name="query" ref="xmlquery"/>
+ </bean>
+
+</beans>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-08-23 22:49:46
|
Revision: 1930
http://archive-access.svn.sourceforge.net/archive-access/?rev=1930&view=rev
Author: bradtofel
Date: 2007-08-23 15:49:48 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
CONFIG: numerous changes, including reference examples for filelocationDB & ArcProxy application, earliestTimestamp, generic "configs" maps, new IndexClient interface, new ReplayDispatcher interface
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-08-23 22:44:18 UTC (rev 1929)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-08-23 22:49:48 UTC (rev 1930)
@@ -2,6 +2,20 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
+ <bean id="filelocationdb" class="org.archive.wayback.resourcestore.http.FileLocationDB"
+ init-method="init">
+ <property name="bdbPath" value="/tmp/wayback/arc-db" />
+ <property name="bdbName" value="DB1" />
+ <property name="logPath" value="/tmp/wayback/arc-db.log" />
+ </bean>
+
+ <bean name="8080:arcproxy" class="org.archive.wayback.resourcestore.http.ArcProxyServlet">
+ <property name="locationDB" ref="filelocationdb" />
+ </bean>
+ <bean name="8080:locationdb" class="org.archive.wayback.resourcestore.http.FileLocationDBServlet">
+ <property name="locationDB" ref="filelocationdb" />
+ </bean>
+
<bean id="bdbsearchresultsource"
class="org.archive.wayback.resourceindex.bdb.BDBIndex"
init-method="init">
@@ -46,8 +60,8 @@
</bean>
- <bean id="archivalurlreplay" class="org.archive.wayback.archivalurl.JSReplayRenderer">
- <property name="JSInserts">
+ <bean id="archivalurlreplay" class="org.archive.wayback.archivalurl.ArchivalUrlReplayDispatcher">
+ <property name="jsInserts">
<list>
<value>http://localhost:8080/wm.js</value>
</list>
@@ -62,7 +76,7 @@
</bean>
- <bean id="proxyreplay" class="org.archive.wayback.proxy.RawReplayRenderer">
+ <bean id="proxyreplay" class="org.archive.wayback.proxy.ProxyReplayDispatcher">
</bean>
<bean id="proxyuriconverter" class="org.archive.wayback.proxy.RedirectResultURIConverter">
<property name="redirectURI" value="http://localhost:8090/jsp/QueryUI/Redirect.jsp" />
@@ -89,6 +103,9 @@
<prop key="key2">key2-value</prop>
</props>
</property>
+<!--
+ <property name="index" ref="localcdxindex" />
+-->
<property name="index">
<bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
<property name="source">
@@ -109,16 +126,19 @@
<property name="maxRecords" value="10000" />
</bean>
</property>
-
<property name="store">
<bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
init-method="init">
<property name="arcDir" value="/tmp/wayback/arcs/" />
<property name="queuedDir" value="/tmp/wayback/arc-indexer/queued" />
- <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
<property name="workDir" value="/tmp/wayback/arc-indexer/work" />
- <property name="indexTarget" value="/tmp/wayback/index-data/incoming" />
- <property name="runInterval" value="10000" />
+ <property name="runInterval" value="10000" />
+ <property name="indexClient">
+ <bean class="org.archive.wayback.resourceindex.indexer.IndexClient">
+ <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
+ <property name="target" value="/tmp/wayback/index-data/incoming" />
+ </bean>
+ </property>
</bean>
</property>
@@ -129,12 +149,17 @@
</property>
<property name="replay">
- <bean class="org.archive.wayback.archivalurl.JSReplayRenderer">
- <property name="JSInserts">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlReplayDispatcher">
+ <property name="jsInserts">
<list>
<value>http://localhost:8080/wm.js</value>
</list>
</property>
+ <property name="jspInserts">
+ <list>
+ <value>/jsp/TimelineUI/Timeline.jsp</value>
+ </list>
+ </property>
</bean>
</property>
@@ -142,6 +167,7 @@
<bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser"
init-method="init">
<property name="maxRecords" value="1000" />
+ <property name="earliestTimestamp" value="1996" />
</bean>
</property>
@@ -153,14 +179,26 @@
</bean>
- <bean name="8080:wayback-xml" parent="8080:wayback">
- <property name="configs">
- <props>
- <prop key="key1">xml-key1-value</prop>
- <prop key="key2">xml-key2-value</prop>
- </props>
+ <bean name="8081" parent="8080:wayback">
+ <property name="useServerName" value="true" />
+ <property name="replay">
+ <bean class="org.archive.wayback.domainprefix.DomainPrefixReplayDispatcher" />
</property>
- <property name="query" ref="xmlquery"/>
+
+ <property name="parser">
+ <bean class="org.archive.wayback.domainprefix.DomainPrefixCompositeRequestParser"
+ init-method="init">
+ <property name="hostPort" value="localhost.archive.org:8081" />
+ <property name="maxRecords" value="1000" />
+ <property name="earliestTimestamp" value="1996" />
+ </bean>
+ </property>
+
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.domainprefix.DomainPrefixResultURIConverter">
+ <property name="hostPort" value="localhost.archive.org:8081" />
+ </bean>
+ </property>
</bean>
</beans>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-08-30 22:55:19
|
Revision: 1971
http://archive-access.svn.sourceforge.net/archive-access/?rev=1971&view=rev
Author: bradtofel
Date: 2007-08-30 15:55:19 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
BUGFIX: corrected default timeline jsp-insert to correct location.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-08-29 22:14:33 UTC (rev 1970)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-08-30 22:55:19 UTC (rev 1971)
@@ -157,7 +157,7 @@
</property>
<property name="jspInserts">
<list>
- <value>/jsp/TimelineUI/Timeline.jsp</value>
+ <value>/replay/Timeline.jsp</value>
</list>
</property>
</bean>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-10-02 03:35:03
|
Revision: 2032
http://archive-access.svn.sourceforge.net/archive-access/?rev=2032&view=rev
Author: bradtofel
Date: 2007-10-01 20:35:05 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
UPDATE: major overhaul in prep for 1.0, setting default configuration, and leaving commonly used options present but commented out.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-10-02 03:33:49 UTC (rev 2031)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-10-02 03:35:05 UTC (rev 2032)
@@ -2,6 +2,12 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
+<!--
+ The following 3 beans are required when using the ArcProxy for providing
+ HTTP 1.1 remote access to ARC files distributed across multiple computers
+ or directories.
+-->
+<!--
<bean id="filelocationdb" class="org.archive.wayback.resourcestore.http.FileLocationDB"
init-method="init">
<property name="bdbPath" value="/tmp/wayback/arc-db" />
@@ -15,133 +21,160 @@
<bean name="8080:locationdb" class="org.archive.wayback.resourcestore.http.FileLocationDBServlet">
<property name="locationDB" ref="filelocationdb" />
</bean>
+-->
- <bean id="bdbsearchresultsource"
- class="org.archive.wayback.resourceindex.bdb.BDBIndex"
- init-method="init">
- <property name="bdbName" value="DB1" />
- <property name="bdbPath" value="/tmp/wayback/index/" />
- </bean>
- <bean id="cdxsearchresultsource" class="org.archive.wayback.resourceindex.cdx.CDXIndex">
- <property name="path" value="/tmp/wayback/cdx-index/index.cdx" />
- </bean>
+<!--
+ The following 2 beans are required when using exclusions based on live
+ robots.txt documents.
+-->
+<!--
+ <bean id="livewebcache" class="org.archive.wayback.liveweb.LiveWebCache">
- <bean id="compositecdxresultsource" class="org.archive.wayback.resourceindex.CompositeSearchResultSource">
- <property name="CDXSources">
- <list>
- <value>/tmp/wayback/cdx-index/index.cdx.1</value>
- <value>/tmp/wayback/cdx-index/index.cdx.2</value>
- </list>
- </property>
- </bean>
+ <property name="arcCacheDir">
+ <bean class="org.archive.wayback.liveweb.ARCCacheDirectory"
+ init-method="init">
+
+ <property name="arcDir" value="/tmp/wayback/liveweb/arcs/" />
+ <property name="arcPrefix" value="live" />
+ </bean>
+ </property>
- <bean id="localbdbindex" class="org.archive.wayback.resourceindex.LocalResourceIndex">
- <property name="source" ref="bdbsearchresultsource" />
- <property name="maxRecords" value="10000" />
- </bean>
- <bean id="localcdxindex" class="org.archive.wayback.resourceindex.LocalResourceIndex">
- <property name="source" ref="cdxsearchresultsource" />
- <property name="maxRecords" value="10000" />
- </bean>
+ <property name="cacher">
+ <bean class="org.archive.wayback.liveweb.URLCacher">
+ <property name="tmpDir" value="/tmp/wayback/liveweb/tmp/" />
+ </bean>
+ </property>
- <bean id="localstore" class="org.archive.wayback.resourcestore.LocalARCResourceStore">
- <property name="arcDir" value="/tmp/wayback/arcs/" />
- </bean>
+ <property name="index">
+ <bean class="org.archive.wayback.liveweb.LiveWebLocalResourceIndex">
- <bean id="standardquery" class="org.archive.wayback.query.Renderer">
- </bean>
- <bean id="calendarquery" class="org.archive.wayback.query.Renderer">
- </bean>
- <bean id="xmlquery" class="org.archive.wayback.query.Renderer">
- <property name="captureJsp" value="/jsp/XMLResults.jsp" />
- <property name="urlJsp" value="/jsp/XMLResults.jsp" />
- <property name="errorJsp" value="/jsp/XMLError.jsp" />
- </bean>
+ <property name="source">
+ <bean class="org.archive.wayback.resourceindex.bdb.BDBIndex"
+ init-method="init">
+ <property name="bdbName" value="DB1" />
+ <property name="bdbPath" value="/tmp/wayback/liveweb/db/" />
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <bean id="excluder-factory-robot" class="org.archive.wayback.accesscontrol.robotstxt.RobotExclusionFilterFactory">
+ <property name="maxCacheMS" value="86400000" />
+ <property name="userAgent" value="ia_archiver" />
+ <property name="webCache" ref="livewebcache" />
+ </bean>
+-->
- <bean id="archivalurlreplay" class="org.archive.wayback.archivalurl.ArchivalUrlReplayDispatcher">
- <property name="jsInserts">
- <list>
- <value>http://localhost:8080/wm.js</value>
- </list>
- </property>
- </bean>
- <bean id="archivalurluriconverter"
- class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost:8080/wayback/" />
- </bean>
- <bean id="archivalurlparser" class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser" init-method="init">
- <property name="maxRecords" value="1000" />
- </bean>
+ <bean id="localbdbcollection" class="org.archive.wayback.webapp.WaybackCollection">
+ <property name="resourceStore">
+ <bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
+ init-method="init">
+ <property name="arcDir" value="/tmp/wayback/arcs/" />
+ <property name="queuedDir" value="/tmp/wayback/arc-indexer/queued" />
+ <property name="workDir" value="/tmp/wayback/arc-indexer/work" />
+ <property name="runInterval" value="10000" />
+ <property name="indexClient">
+ <bean class="org.archive.wayback.resourceindex.indexer.IndexClient">
+ <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
+ <property name="target" value="/tmp/wayback/index-data/incoming" />
+ </bean>
+ </property>
+ </bean>
+ </property>
- <bean id="proxyreplay" class="org.archive.wayback.proxy.ProxyReplayDispatcher">
- </bean>
- <bean id="proxyuriconverter" class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://localhost:8090/jsp/QueryUI/Redirect.jsp" />
- </bean>
- <bean id="proxyparser" class="org.archive.wayback.proxy.ProxyRequestParser" init-method="init">
- <property name="maxRecords" value="1000" />
- </bean>
+ <property name="resourceIndex">
+ <bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
+ <property name="source">
+ <bean class="org.archive.wayback.resourceindex.bdb.BDBIndex"
+ init-method="init">
+ <property name="bdbName" value="DB1" />
+ <property name="bdbPath" value="/tmp/wayback/index/" />
+ <property name="updater">
+ <bean class="org.archive.wayback.resourceindex.bdb.BDBIndexUpdater">
+ <property name="incoming" value="/tmp/wayback/index-data/incoming/" />
+ <property name="failed" value="/tmp/wayback/index-data/failed/" />
+ <property name="merged" value="/tmp/wayback/index-data/merged/" />
+ <property name="runInterval" value="10000" />
+ </bean>
+ </property>
+ </bean>
+ </property>
+ <property name="maxRecords" value="10000" />
+ </bean>
+ </property>
+ </bean>
+<!--
+ The following WaybackCollection bean template is required when using a
+ manually built local CDX index.
+-->
+<!--
+ <bean id="localcdxcollection" class="org.archive.wayback.webapp.WaybackCollection">
- <bean id="archivalcontext" abstract="true"
- class="org.archive.wayback.webapp.WaybackContext">
- <property name="index" ref="localbdbindex" />
- <property name="store" ref="localstore" />
- <property name="query" ref="standardquery" />
- <property name="replay" ref="archivalurlreplay" />
- <property name="parser" ref="archivalurlparser" />
- <property name="uriConverter" ref="archivalurluriconverter" />
- </bean>
+ <property name="resourceStore">
+ <bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
+ init-method="init">
+ <property name="arcDir" value="/tmp/wayback/arcs/" />
+ </bean>
+ </property>
- <bean name="8080:wayback" class="org.archive.wayback.webapp.WaybackContext">
- <property name="configs">
- <props>
- <prop key="key1">key1-value</prop>
- <prop key="key2">key2-value</prop>
- </props>
- </property>
+ <property name="resourceIndex">
+ <bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
+ <property name="source">
+ <bean id="cdxsearchresultsource" class="org.archive.wayback.resourceindex.cdx.CDXIndex">
+ <property name="path" value="/tmp/wayback/cdx-index/index.cdx" />
+ </bean>
+ </property>
+ <property name="maxRecords" value="10000" />
+ </bean>
+ </property>
+ </bean>
+-->
+
+
<!--
- <property name="index" ref="localcdxindex" />
+ The following WaybackCollection bean template is required when using a
+ remote ResourceIndex and ResourceStore implementation. This will also
+ required setting up an arcproxy and locationdb on the host specified by
+ the resourceStore:urlPrefix configuration, and an addition AccessPoint
+ on the host specified by the resourceIndex:searchUrlBase configuration.
-->
- <property name="index">
- <bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
- <property name="source">
- <bean class="org.archive.wayback.resourceindex.bdb.BDBIndex"
- init-method="init">
- <property name="bdbName" value="DB1" />
- <property name="bdbPath" value="/tmp/wayback/index/" />
- <property name="updater">
- <bean class="org.archive.wayback.resourceindex.bdb.BDBIndexUpdater">
- <property name="incoming" value="/tmp/wayback/index-data/incoming/" />
- <property name="failed" value="/tmp/wayback/index-data/failed/" />
- <property name="merged" value="/tmp/wayback/index-data/merged/" />
- <property name="runInterval" value="10000" />
- </bean>
- </property>
- </bean>
- </property>
- <property name="maxRecords" value="10000" />
- </bean>
- </property>
- <property name="store">
- <bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
- init-method="init">
- <property name="arcDir" value="/tmp/wayback/arcs/" />
- <property name="queuedDir" value="/tmp/wayback/arc-indexer/queued" />
- <property name="workDir" value="/tmp/wayback/arc-indexer/work" />
- <property name="runInterval" value="10000" />
- <property name="indexClient">
- <bean class="org.archive.wayback.resourceindex.indexer.IndexClient">
- <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
- <property name="target" value="/tmp/wayback/index-data/incoming" />
- </bean>
- </property>
- </bean>
- </property>
-
+<!--
+ <bean id="remotecollection" class="org.archive.wayback.webapp.WaybackCollection">
+
+ <property name="resourceStore">
+ <bean class="org.archive.wayback.resourcestore.HttpARCResourceStore">
+ <property name="urlPrefix" value="http://localhost:8080/arcproxy/" />
+ </bean>
+ </property>
+
+ <property name="resourceIndex">
+ <bean class="org.archive.wayback.resourceindex.RemoteResourceIndex"
+ init-method="init">
+ <property name="searchUrlBase" value="http://indexhost:8080/index/xmlquery" />
+ </bean>
+ </property>
+ </bean>
+-->
+
+<!--
+ This is the only AccessPoint defined by default within this wayback.xml
+ Spring configuration file, providing an ArchivalURL Replay UI to the
+ "localbdbcollection" by providing ArchivalURL-specific implementations
+ of the replay, parser, and uriConverter.
+
+ This AccessPoint currently will provide access only from the machine
+ running Tomcat. To provide external access, replace "localhost" with your
+ fully qualified hostname of the computer running Tomcat.
+-->
+ <bean name="8080:wayback" class="org.archive.wayback.webapp.AccessPoint">
+
+ <property name="collection" ref="localbdbcollection" />
+
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
<property name="captureJsp" value="/jsp/HTMLResults.jsp" />
@@ -178,27 +211,78 @@
</property>
</bean>
-
- <bean name="8081" parent="8080:wayback">
- <property name="useServerName" value="true" />
- <property name="replay">
- <bean class="org.archive.wayback.domainprefix.DomainPrefixReplayDispatcher" />
- </property>
-
- <property name="parser">
- <bean class="org.archive.wayback.domainprefix.DomainPrefixCompositeRequestParser"
- init-method="init">
- <property name="hostPort" value="localhost.archive.org:8081" />
- <property name="maxRecords" value="1000" />
- <property name="earliestTimestamp" value="1996" />
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but only allows access from the specified IP network.
+-->
+<!--
+ <bean name="8080:netsecure" parent="8080:wayback">
+ <property name="authentication">
+ <bean class="org.archive.wayback.authenticationcontrol.IPMatchesBooleanOperator">
+ <property name="allowedRanges">
+ <list>
+ <value>192.168.1.16/24</value>
+ </list>
+ </property>
</bean>
</property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://192.168.1.16:8080/netsecure/" />
+ </bean>
+ </property>
+ </bean>
+-->
- <property name="uriConverter">
- <bean class="org.archive.wayback.domainprefix.DomainPrefixResultURIConverter">
- <property name="hostPort" value="localhost.archive.org:8081" />
- </bean>
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but checks live web robots.txt documents to determine if
+ archived content should be accessible.
+
+ Note: using this AccessPoint requires enabling the "livewebcache" and
+ "excluder-factory-robot" beans declared at the top of this file.
+-->
+<!--
+ <bean name="8080:robots" parent="8080:wayback">
+ <property name="exclusionFactory" ref="excluder-factory-robot" />
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/robots/" />
+ </bean>
+ </property>
+ </bean>
+-->
+
+
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but provides a Proxy Replay UI to the same collection. These
+ two access points can be used simultaneously on the same Tomcat
+ installation.
+
+ Note: using this AccessPoint requires adding a "Connector" on port 8090
+ in your Tomcat's server.xml file.
+ -->
+<!--
+ <bean name="8090" parent="8080:wayback">
+ <property name="replay">
+ <bean class="org.archive.wayback.proxy.ProxyReplayDispatcher" />
</property>
- </bean>
-
+ <property name="uriconverter">
+ <bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
+ <property name="redirectURI" value="http://foo.archive.org:8090/jsp/Redirect.jsp" />
+ </bean>
+ </property>
+ <property name="parser">
+ <bean class="org.archive.wayback.proxy.ProxyRequestParser" init-method="init">
+ <property name="localhostNames">
+ <list>
+ <value>foo.archive.org</value>
+ </list>
+ </property>
+ <property name="maxRecords" value="1000" />
+ </bean>
+ </property>
+ </bean>
+-->
</beans>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-10-15 21:22:39
|
Revision: 2054
http://archive-access.svn.sourceforge.net/archive-access/?rev=2054&view=rev
Author: bradtofel
Date: 2007-10-15 14:22:32 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
BUGFIX: uriconverter => uriConverter
also WHITESPACE changes
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-10-14 08:25:37 UTC (rev 2053)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-10-15 21:22:32 UTC (rev 2054)
@@ -264,25 +264,25 @@
in your Tomcat's server.xml file.
-->
<!--
- <bean name="8090" parent="8080:wayback">
- <property name="replay">
- <bean class="org.archive.wayback.proxy.ProxyReplayDispatcher" />
- </property>
- <property name="uriconverter">
- <bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://foo.archive.org:8090/jsp/Redirect.jsp" />
- </bean>
- </property>
- <property name="parser">
- <bean class="org.archive.wayback.proxy.ProxyRequestParser" init-method="init">
- <property name="localhostNames">
- <list>
- <value>foo.archive.org</value>
- </list>
- </property>
- <property name="maxRecords" value="1000" />
- </bean>
- </property>
- </bean>
+<bean name="8090" parent="8080:wayback">
+ <property name="replay">
+ <bean class="org.archive.wayback.proxy.ProxyReplayDispatcher" />
+ </property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
+ <property name="redirectURI" value="http://foo.archive.org:8090/jsp/Redirect.jsp" />
+ </bean>
+ </property>
+ <property name="parser">
+ <bean class="org.archive.wayback.proxy.ProxyRequestParser" init-method="init">
+ <property name="localhostNames">
+ <list>
+ <value>foo.archive.org</value>
+ </list>
+ </property>
+ <property name="maxRecords" value="1000" />
+ </bean>
+ </property>
+</bean>
-->
</beans>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-01-30 03:07:14
|
Revision: 2158
http://archive-access.svn.sourceforge.net/archive-access/?rev=2158&view=rev
Author: bradtofel
Date: 2008-01-29 19:07:20 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
Updated to reflect new ResourceStore implementation class names, and to use new Replay jspInserts, including some example jsp inserts.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-01-30 03:05:36 UTC (rev 2157)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-01-30 03:07:20 UTC (rev 2158)
@@ -71,16 +71,22 @@
<bean id="localbdbcollection" class="org.archive.wayback.webapp.WaybackCollection">
<property name="resourceStore">
- <bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
+ <bean class="org.archive.wayback.resourcestore.LocalResourceStore"
init-method="init">
- <property name="arcDir" value="/tmp/wayback/arcs/" />
- <property name="queuedDir" value="/tmp/wayback/arc-indexer/queued" />
- <property name="workDir" value="/tmp/wayback/arc-indexer/work" />
- <property name="runInterval" value="10000" />
- <property name="indexClient">
- <bean class="org.archive.wayback.resourceindex.indexer.IndexClient">
- <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
- <property name="target" value="/tmp/wayback/index-data/incoming" />
+
+ <property name="dataDir" value="/tmp/wayback/arcs/" />
+
+ <property name="indexThread">
+ <bean class="org.archive.wayback.resourcestore.AutoIndexThread">
+ <property name="queuedDir" value="/tmp/wayback/arc-indexer/queued" />
+ <property name="workDir" value="/tmp/wayback/arc-indexer/work" />
+ <property name="runInterval" value="10000" />
+ <property name="indexClient">
+ <bean class="org.archive.wayback.resourceindex.indexer.IndexClient">
+ <property name="tmpDir" value="/tmp/wayback/arc-indexer/tmp" />
+ <property name="target" value="/tmp/wayback/index-data/incoming" />
+ </bean>
+ </property>
</bean>
</property>
</bean>
@@ -116,9 +122,9 @@
<bean id="localcdxcollection" class="org.archive.wayback.webapp.WaybackCollection">
<property name="resourceStore">
- <bean class="org.archive.wayback.resourcestore.LocalARCResourceStore"
+ <bean class="org.archive.wayback.resourcestore.LocalResourceStore"
init-method="init">
- <property name="arcDir" value="/tmp/wayback/arcs/" />
+ <property name="dataDir" value="/tmp/wayback/arcs/" />
</bean>
</property>
@@ -147,7 +153,7 @@
<bean id="remotecollection" class="org.archive.wayback.webapp.WaybackCollection">
<property name="resourceStore">
- <bean class="org.archive.wayback.resourcestore.HttpARCResourceStore">
+ <bean class="org.archive.wayback.resourcestore.Http11ResourceStore">
<property name="urlPrefix" value="http://localhost:8080/arcproxy/" />
</bean>
</property>
@@ -175,26 +181,47 @@
<property name="collection" ref="localbdbcollection" />
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/wayback/" />
+ </bean>
+ </property>
+
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
<property name="captureJsp" value="/jsp/HTMLResults.jsp" />
</bean>
</property>
- <property name="replay">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlReplayDispatcher">
- <property name="jsInserts">
- <list>
- <value>http://localhost:8080/wm.js</value>
- </list>
- </property>
- <property name="jspInserts">
- <list>
- <value>/replay/Timeline.jsp</value>
- </list>
- </property>
- </bean>
- </property>
+ <property name="replay">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlReplayDispatcher">
+ <property name="serverSideRendering" value="false" />
+ <property name="jspInserts">
+ <list>
+ <value>/replay/ArchiveComment.jsp</value>
+ <value>/replay/ClientSideJSInsert.jsp</value>
+<!--
+ The following 2 .jsp include values will produce in-page elements within
+ replayed HTML pages. Both require client-side Javascript.
+-->
+<!--
+ <value>/replay/Disclaimer.jsp</value>
+ <value>/replay/Timeline.jsp</value>
+-->
+<!--
+ The following .jsp include value will produce a timeline within *all* replayed
+ pages, including all subframes within a frameset, but requires no client side
+ Javascript. It is intended for use in deployments which use:
+
+ serverSideRendering=true
+-->
+<!--
+ <value>/replay/JSLessTimeline.jsp</value>
+-->
+ </list>
+ </property>
+ </bean>
+ </property>
<property name="parser">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser"
@@ -203,12 +230,6 @@
<property name="earliestTimestamp" value="1996" />
</bean>
</property>
-
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost:8080/wayback/" />
- </bean>
- </property>
</bean>
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-04-16 00:37:41
|
Revision: 2243
http://archive-access.svn.sourceforge.net/archive-access/?rev=2243&view=rev
Author: bradtofel
Date: 2008-04-15 17:37:46 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
TWEAK: Added oracle exclusion example, added NutchWAX example.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-04-16 00:36:51 UTC (rev 2242)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-04-16 00:37:46 UTC (rev 2243)
@@ -67,7 +67,19 @@
<property name="webCache" ref="livewebcache" />
</bean>
-->
+<!--
+ The following bean is an example using the Access Control Oracle, thanks Alex Osborne.
+ Currently this is pretty undocumented, but here is a place to get started:
+ http://webteam.archive.org/confluence/display/wayback/Exclusions+API
+-->
+<!--
+ <bean id="excluder-factory-oracle" class="org.archive.wayback.accesscontrol.oracleclient.OracleExclusionFilterFactory">
+ <property name="oracleUrl" value="http://192.168.1.11:8080/oracle-0.0.1-SNAPSHOT/" />
+ <property name="accessGroup" value="ia_archiver" />
+ </bean>
+-->
+
<bean id="localbdbcollection" class="org.archive.wayback.webapp.WaybackCollection">
<property name="resourceStore">
@@ -164,10 +176,37 @@
<property name="searchUrlBase" value="http://indexhost:8080/index/xmlquery" />
</bean>
</property>
+
+
</bean>
-->
<!--
+ The following WaybackCollection bean template is an example for using a NutchWAX
+ full-text index with Wayback, using a RemoteResourceStore to access
+ replayed documents. You will need to change searchUrlBase to your local NutchWAX
+ installation. You may also need to ensure that the maxRecords on your RequestParser is
+ not greater than the maxRecords configured on the RemoteNutchResourceIndex.
+-->
+<!--
+ <bean id="remotenutchcollection" class="org.archive.wayback.webapp.WaybackCollection">
+
+ <property name="resourceStore">
+ <bean class="org.archive.wayback.resourcestore.Http11ResourceStore">
+ <property name="urlPrefix" value="http://localhost:8080/arcproxy/" />
+ </bean>
+ </property>
+
+ <property name="resourceIndex">
+ <bean class="org.archive.wayback.resourceindex.NutchResourceIndex" init-method="init">
+ <property name="searchUrlBase" value="http://webteam-ws.us.archive.org:8080/katrina/opensearch" />
+ <property name="maxRecords" value="100" />
+ </bean>
+ </property>
+ </bean>
+-->
+
+<!--
This is the only AccessPoint defined by default within this wayback.xml
Spring configuration file, providing an ArchivalURL Replay UI to the
"localbdbcollection" by providing ArchivalURL-specific implementations
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