Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[2481] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF
|
From: <bra...@us...> - 2008-07-22 02:48:06
|
Revision: 2481
http://archive-access.svn.sourceforge.net/archive-access/?rev=2481&view=rev
Author: bradtofel
Date: 2008-07-22 02:48:14 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
REFACTOR: moved all the cumbersome wiring Spring code for the various Replay modes into separate files, which are now imported into the main wayback.xml file.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/DomainPrefixReplay.xml
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ProxyReplay.xml
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ArchivalUrlReplay.xml 2008-07-22 02:48:14 UTC (rev 2481)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <bean id="archivalurlhttpheaderprocessor" class="org.archive.wayback.replay.RedirectRewritingHttpHeaderProcessor" />
+
+ <bean id="archivaldateredirectingreplayrenderer" class="org.archive.wayback.replay.DateRedirectReplayRenderer" />
+ <bean id="archivalcssreplayrenderer" class="org.archive.wayback.archivalurl.ArchivalUrlCSSReplayRenderer">
+ <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
+ </bean>
+ <bean id="archivalasxreplayrenderer" class="org.archive.wayback.archivalurl.ArchivalUrlASXReplayRenderer">
+ <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
+ </bean>
+ <bean id="archivaltransparentreplayrenderer" class="org.archive.wayback.replay.TransparentReplayRenderer">
+ <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
+ </bean>
+
+ <bean id="archivalserversidehtmlreplayrenderer" class="org.archive.wayback.archivalurl.ServerSideHTMLReplayRenderer">
+ <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
+ <property name="jspInserts">
+ <list>
+ <value>/WEB-INF/replay/ArchiveComment.jsp</value>
+<!--
+ <value>/WEB-INF/replay/JSLessTimeline.jsp</value>
+-->
+ </list>
+ </property>
+ </bean>
+
+ <bean id="archivalclientsidehtmlreplayrenderer" class="org.archive.wayback.archivalurl.ClientSideHTMLReplayRenderer">
+ <constructor-arg><ref bean="archivalurlhttpheaderprocessor"/></constructor-arg>
+ <property name="jspInserts">
+ <list>
+ <value>/WEB-INF/replay/ArchiveComment.jsp</value>
+ <value>/WEB-INF/replay/ClientSideJSInsert.jsp</value>
+ <value>/WEB-INF/replay/DebugBanner.jsp</value>
+<!--
+ <value>/WEB-INF/replay/Disclaimer.jsp</value>
+ <value>/WEB-INF/replay/Timeline.jsp</value>
+-->
+ </list>
+ </property>
+ </bean>
+
+ <bean id="archivalurlreplay" class="org.archive.wayback.replay.SelectorReplayDispatcher">
+ <property name="selectors">
+ <list>
+
+ <!-- REDIRECT IF NOT EXACT DATE -->
+ <bean class="org.archive.wayback.replay.selector.DateMismatchSelector">
+ <property name="renderer" ref="archivaldateredirectingreplayrenderer"/>
+ </bean>
+
+ <!-- HTML REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+ <property name="mimeContains">
+ <list>
+ <value>text/html</value>
+ <value>application/xhtml</value>
+ </list>
+ </property>
+ <property name="renderer" ref="archivalclientsidehtmlreplayrenderer"/>
+ </bean>
+
+ <!-- CSS REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+ <property name="mimeContains">
+ <list>
+ <value>text/css</value>
+ </list>
+ </property>
+ <property name="renderer" ref="archivalcssreplayrenderer"/>
+ </bean>
+
+ <!-- ASX-MIME REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+ <property name="mimeContains">
+ <list>
+ <value>video/x-ms-asf</value>
+ </list>
+ </property>
+ <property name="renderer" ref="archivalasxreplayrenderer"/>
+ </bean>
+
+ <!-- ASX-PATH REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.PathMatchSelector">
+ <property name="pathContains">
+ <list>
+ <value>.asx</value>
+ </list>
+ </property>
+ <property name="renderer" ref="archivalasxreplayrenderer"/>
+ </bean>
+
+ <!-- DEFAULT-TRANSPARENT REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.AlwaysMatchSelector">
+ <property name="renderer" ref="archivaltransparentreplayrenderer"/>
+ </bean>
+
+ </list>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/DomainPrefixReplay.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/DomainPrefixReplay.xml (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/DomainPrefixReplay.xml 2008-07-22 02:48:14 UTC (rev 2481)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <bean id="domainprefixhttpheaderprocessor" class="org.archive.wayback.replay.RedirectRewritingHttpHeaderProcessor" />
+
+ <bean id="domainprefixdateredirectingreplayrenderer" class="org.archive.wayback.replay.DateRedirectReplayRenderer" />
+ <bean id="domainprefixtransparentreplayrenderer" class="org.archive.wayback.replay.TransparentReplayRenderer">
+ <constructor-arg><ref bean="domainprefixhttpheaderprocessor"/></constructor-arg>
+ </bean>
+
+ <bean id="domainprefixtextreplayrenderer" class="org.archive.wayback.domainprefix.DomainPrefixTextReplayRenderer">
+ <constructor-arg><ref bean="domainprefixhttpheaderprocessor"/></constructor-arg>
+ <property name="jspInserts">
+ <list>
+ <value>/WEB-INF/replay/ArchiveComment.jsp</value>
+ <value>/WEB-INF/replay/DebugBanner.jsp</value>
+<!--
+ <value>/WEB-INF/replay/JSLessTimeline.jsp</value>
+-->
+ </list>
+ </property>
+ </bean>
+
+ <bean id="domainprefixreplay" class="org.archive.wayback.replay.SelectorReplayDispatcher">
+ <property name="selectors">
+ <list>
+
+ <!-- REDIRECT IF NOT EXACT DATE -->
+ <bean class="org.archive.wayback.replay.selector.DateMismatchSelector">
+ <property name="renderer" ref="domainprefixdateredirectingreplayrenderer"/>
+ </bean>
+
+ <!-- HTML REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+ <property name="mimeContains">
+ <list>
+ <value>text/html</value>
+ <value>application/xhtml</value>
+ </list>
+ </property>
+ <property name="renderer" ref="domainprefixtextreplayrenderer"/>
+ </bean>
+ <!-- DEFAULT-TRANSPARENT REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.AlwaysMatchSelector">
+ <property name="renderer" ref="domainprefixtransparentreplayrenderer"/>
+ </bean>
+
+ </list>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ProxyReplay.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ProxyReplay.xml (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ProxyReplay.xml 2008-07-22 02:48:14 UTC (rev 2481)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <bean id="identityhttpheaderprocessor" class="org.archive.wayback.replay.IdentityHttpHeaderProcessor" />
+
+ <bean id="proxytransparentreplayrenderer" class="org.archive.wayback.replay.TransparentReplayRenderer">
+ <constructor-arg><ref bean="identityhttpheaderprocessor"/></constructor-arg>
+ </bean>
+ <bean id="proxymarkupreplayrenderer" class="org.archive.wayback.proxy.ProxyHTMLMarkupReplayRenderer">
+ <constructor-arg><ref bean="identityhttpheaderprocessor"/></constructor-arg>
+ <property name="jspInserts">
+ <list>
+ <value>/WEB-INF/replay/ArchiveComment.jsp</value>
+ <value>/WEB-INF/replay/Disclaimer.jsp</value>
+<!--
+ <value>/replay/JSLessTimeline.jsp</value>
+-->
+ </list>
+ </property>
+ </bean>
+
+ <bean id="proxyreplay" class="org.archive.wayback.replay.SelectorReplayDispatcher">
+ <property name="selectors">
+ <list>
+
+ <!-- HTML REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.MimeTypeSelector">
+ <property name="mimeContains">
+ <list>
+ <value>text/html</value>
+ <value>application/xhtml</value>
+ </list>
+ </property>
+ <property name="renderer" ref="proxymarkupreplayrenderer"/>
+ </bean>
+
+ <!-- DEFAULT-TRANSPARENT REPLAY -->
+ <bean class="org.archive.wayback.replay.selector.AlwaysMatchSelector">
+ <property name="renderer" ref="proxytransparentreplayrenderer"/>
+ </bean>
+
+ </list>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
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-07-22 02:45:34 UTC (rev 2480)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-07-22 02:48:14 UTC (rev 2481)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<!--
The following 3 beans are required when using the ArcProxy for providing
@@ -8,19 +10,6 @@
or directories.
-->
<!--
- <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>
-->
@@ -34,7 +23,6 @@
<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>
@@ -67,19 +55,21 @@
<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:
+ The following bean is an example using the Access Control Oracle, thanks
+ Alex Osborne and NLA. 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="oracleUrl" value="http://localhost:8180/oracle/" />
<property name="accessGroup" value="ia_archiver" />
</bean>
--->
+<!--
<bean id="localbdbcollection" class="org.archive.wayback.webapp.WaybackCollection">
<property name="resourceStore">
@@ -125,8 +115,123 @@
</bean>
</property>
</bean>
+-->
+
+
+
<!--
+ <property name="annotater">
+ <bean class="org.archive.wayback.resourceindex.filters.OracleAnnotationFilter">
+ <property name="oracleUrl" value="http://localhost:8180/oracle/" />
+ <property name="who" value="annotation" />
+ </bean>
+ </property>
+-->
+
+ <bean id="resourcefilelocationdb" class="org.archive.wayback.resourcestore.locationdb.BDBResourceFileLocationDB"
+ init-method="init">
+ <property name="bdbPath" value="/tmp/wayback/file-db" />
+ <property name="bdbName" value="DB1" />
+ <property name="logPath" value="/tmp/wayback/file-db.log" />
+ </bean>
+ <bean name="8080:locationdb" class="org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDBServlet">
+ <property name="locationDB" ref="resourcefilelocationdb" />
+ </bean>
+ <bean name="8080:fileproxy" class="org.archive.wayback.resourcestore.locationdb.FileProxyServlet">
+ <property name="locationDB" ref="resourcefilelocationdb" />
+ </bean>
+ <bean id="indexqueue" class="org.archive.wayback.resourcestore.indexer.DirectoryIndexQueue">
+ <property name="path" value="/tmp/wayback/indexer-queue" />
+ </bean>
+
+ <bean id="localbdbresourceindex" 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/" />
+ </bean>
+ </property>
+ <property name="maxRecords" value="10000" />
+ </bean>
+
+ <bean id="localbdbcollection" class="org.archive.wayback.webapp.WaybackCollection">
+
+ <property name="resourceStore">
+ <bean id="localresourcestore" class="org.archive.wayback.resourcestore.LocalResourceFileResourceStore">
+ <property name="db" ref="resourcefilelocationdb" />
+ </bean>
+ </property>
+
+ <property name="resourceIndex" ref="localbdbresourceindex"/>
+
+ <property name="shutdownables">
+ <list>
+ <!-- This thread notices new files appearing in your resourcefilesources -->
+ <bean id="resourcefilesourceupdater" class="org.archive.wayback.resourcestore.resourcefile.ResourceFileSourceUpdater"
+ init-method="init">
+ <property name="target" value="/tmp/wayback/file-db-incoming" />
+ <property name="interval" value="100000" />
+ <property name="sources">
+ <list>
+ <bean id="resourcefilesource" class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
+ <property name="name" value="braddir1" />
+ <property name="prefix" value="/tmp/wayback/files1/" />
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+ <!-- This thread updates the location db with updates from resourcefilesourceupdater -->
+ <bean id="resourcefilelocationdbupdater" class="org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDBUpdater"
+ init-method="init">
+ <property name="interval" value="100000" />
+ <property name="db" ref="resourcefilelocationdb" />
+ <property name="incomingDir" value="/tmp/wayback/file-db-incoming" />
+ <property name="stateDir" value="/tmp/wayback/file-db-state" />
+ </bean>
+
+ <!-- This thread notices new files arriving in the filelocationdb, and queues them for indexing -->
+ <bean id="indexqueueupdater" class="org.archive.wayback.resourcestore.indexer.IndexQueueUpdater"
+ init-method="init">
+ <property name="db" ref="resourcefilelocationdb" />
+ <property name="queue" ref="indexqueue" />
+ <property name="interval" value="1000" />
+ <property name="lastMark" value="/tmp/wayback/index-queue.mark" />
+ </bean>
+
+ <!-- This thread checks the to-be-indexed queue for files needing indexing, indexes them, and hands off the results for merging with the ResourceIndex -->
+ <bean id="indexworker" class="org.archive.wayback.resourcestore.indexer.IndexWorker"
+ init-method="init">
+ <property name="db" ref="resourcefilelocationdb" />
+ <property name="queue" ref="indexqueue" />
+ <property name="interval" value="1000" />
+ <property name="target">
+ <bean class="org.archive.wayback.resourceindex.updater.IndexClient">
+ <property name="tmpDir" value="/tmp/wayback/index-data/tmp/" />
+ <property name="target" value="/tmp/wayback/index-data/incoming/" />
+ </bean>
+ </property>
+ </bean>
+
+ <!-- This thread merges updates from the indexworker into the ResourceIndex -->
+ <bean class="org.archive.wayback.resourceindex.updater.LocalResourceIndexUpdater"
+ init-method="init">
+
+ <property name="index" ref="localbdbresourceindex" />
+ <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>
+ </list>
+ </property>
+ </bean>
+
+
+
+<!--
The following WaybackCollection bean template is required when using a
manually built local CDX index.
-->
@@ -157,8 +262,8 @@
<!--
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
+ require setting up an arcproxy and locationdb on the host specified by
+ the resourceStore:urlPrefix configuration, and an additional AccessPoint
on the host specified by the resourceIndex:searchUrlBase configuration.
-->
<!--
@@ -176,8 +281,6 @@
<property name="searchUrlBase" value="http://indexhost:8080/index/xmlquery" />
</bean>
</property>
-
-
</bean>
-->
@@ -188,23 +291,28 @@
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/" />
+<!--
+ <property name="urlPrefix" value="http://crawling11.us.archive.org/arcproxy/" />
+-->
+ <property name="urlPrefix" value="http://webapp100.us.archive.org/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="searchUrlBase" value="http://192.168.1.208:9090/nutch-1.0-dev/opensearch" />
<property name="maxRecords" value="100" />
</bean>
</property>
</bean>
--->
<!--
This is the only AccessPoint defined by default within this wayback.xml
@@ -216,51 +324,32 @@
running Tomcat. To provide external access, replace "localhost" with your
fully qualified hostname of the computer running Tomcat.
-->
+ <import resource="ArchivalUrlReplay.xml"/>
<bean name="8080:wayback" class="org.archive.wayback.webapp.AccessPoint">
-
+ <!--
+ <property name="exclusionFactory" ref="excluder-factory-oracle" />
+ -->
<property name="collection" ref="localbdbcollection" />
+ <property name="configs">
+ <props>
+ <prop key="inst">foo</prop>
+ <prop key="coll">supreme court</prop>
+ </props>
+ </property>
<property name="uriConverter">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost:8080/wayback/" />
+ <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" />
+ <property name="captureJsp" value="/WEB-INF/query/CalendarResults.jsp" />
</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="replay" ref="archivalurlreplay" />
<property name="parser">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser"
@@ -271,20 +360,68 @@
</property>
</bean>
+ <bean name="8080:rwayback" parent="8080:wayback">
+ <property name="parser">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser"
+ init-method="init">
+ <property name="maxRecords" value="100" />
+ <property name="earliestTimestamp" value="1996" />
+ </bean>
+ </property>
+ <property name="exception">
+ <bean class="org.archive.wayback.exception.CustomNotInArchiveExceptionRenderer">
+ <property name="hosts">
+ <list>
+ <value>www.aladems.org</value>
+ </list>
+ </property>
+ <property name="jspHandler" value="/exception/GrayBlank.jsp"/>
+ </bean>
+ </property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/rwayback/" />
+ </bean>
+ </property>
+ <property name="collection" ref="remotenutchcollection">
+ <!--
+ <bean class="org.archive.wayback.webapp.WaybackCollection">
+ <property name="resourceStore" ref="fancyresourcestore" />
+ <property name="resourceIndex">
+ <bean class="org.archive.wayback.resourceindex.RemoteResourceIndex"
+ init-method="init">
+ <property name="searchUrlBase" value="http://localhost:8080/wayback/xmlquery" />
+ </bean>
+ </property>
+ </bean>
+ -->
+ </property>
+ </bean>
+
<!--
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>
+ <bean class="org.archive.wayback.authenticationcontrol.AccessControlSettingOperation">
+ <property name="operator">
+ <bean class="org.archive.wayback.util.operator.NotBooleanOperator">
+ <property name="operand">
+ <bean class="org.archive.wayback.authenticationcontrol.IPMatchesBooleanOperator">
+ <property name="allowedRanges">
+ <list>
+ <value>192.168.1.16/24</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ <property name="factory" ref="excluder-factory-robot"/>
+ </bean>
</property>
<property name="uriConverter">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
@@ -293,7 +430,6 @@
</property>
</bean>
-->
-
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but checks live web robots.txt documents to determine if
@@ -313,7 +449,24 @@
</bean>
-->
+<import resource="DomainPrefixReplay.xml"/>
+<bean name="8081" parent="8080:wayback">
+ <property name="useServerName" value="true" />
+ <property name="replay" ref="domainprefixreplay" />
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.domainprefix.DomainPrefixResultURIConverter">
+ <property name="hostPort" value="localhost.archive.org:8081" />
+ </bean>
+ </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" />
+ </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
@@ -323,27 +476,24 @@
Note: using this AccessPoint requires adding a "Connector" on port 8090
in your Tomcat's server.xml file.
-->
-<!--
+ <import resource="ProxyReplay.xml"/>
<bean name="8090" parent="8080:wayback">
<property name="useServerName" value="true" />
- <property name="replay">
- <bean class="org.archive.wayback.proxy.ProxyReplayDispatcher" />
- </property>
+ <property name="replay" ref="proxyreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://foo.archive.org:8090/jsp/Redirect.jsp" />
+ <property name="redirectURI" value="http://brad.archive.org/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>
+ <value>brad.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.
|
