Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2008-08-19 22:36:43
|
Revision: 2568
http://archive-access.svn.sourceforge.net/archive-access/?rev=2568&view=rev
Author: bradtofel
Date: 2008-08-19 22:36:51 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
RELEASE: finalized config for release: only archival url is active by default.
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-08-19 22:34:51 UTC (rev 2567)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-08-19 22:36:51 UTC (rev 2568)
@@ -56,7 +56,8 @@
<!--
The XML files indicated in the following import tags contain alternate
- example implementations of WaybackCollections.
+ example implementations of WaybackCollections. To specify where your
+ ARC/WARC files are located, see the file BDBCollection.xml.
-->
<import resource="BDBCollection.xml"/>
<!--
@@ -102,60 +103,9 @@
</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>
- </property>
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost.archive.org:8080/netsecure/" />
- </bean>
- </property>
- </bean>
--->
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
- AccessPoint, but uses an Access Control Oracle to determine if archived
- content should be accessible.
-
- The Access Control Oracle was developed by Alex Osborne of the NLA.
-
- Some documentation for this project is available at:
-
- http://webteam.archive.org/confluence/display/wayback/Exclusions+API
--->
-
-<!--
- <bean name="8080:exclusion" parent="8080:wayback">
- <property name="exclusionFactory">
- <bean class="org.archive.wayback.accesscontrol.oracleclient.OracleExclusionFilterFactory">
- <property name="oracleUrl" value="http://localhost:8180/oracle/" />
- <property name="accessGroup" value="ia_archiver" />
- </bean>
- </property>
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost:8080/exclusion/" />
- </bean>
- </property>
- </bean>
--->
-
-<!--
- The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a DomainPrefix Replay UI to the same collection.
These two access points can be used simultaneously on the same Tomcat
installation.
@@ -166,6 +116,7 @@
Note: the hostname suffix localhost.archive.org has a special DNS wildcard
entry, so all hostnames suffixed with this value resolve to 127.0.0.1
-->
+<!--
<import resource="DomainPrefixReplay.xml"/>
<bean name="8081" parent="8080:wayback">
<property name="urlRoot" value="http://localhost.archive.org:8081/" />
@@ -182,8 +133,8 @@
</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
@@ -193,13 +144,14 @@
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="urlRoot" value="http://localhost.archive.org/" />
+ <property name="urlRoot" value="http://localhost.archive.org:8090/" />
<property name="replay" ref="proxyreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://localhost.archive.org/jsp/Redirect.jsp" />
+ <property name="redirectURI" value="http://localhost.archive.org:8090/jsp/QueryUI/Redirect.jsp" />
</bean>
</property>
<property name="parser">
@@ -213,4 +165,60 @@
</bean>
</property>
</bean>
+-->
+
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but uses an Access Control Oracle to determine if archived
+ content should be accessible.
+
+ The Access Control Oracle was developed by Alex Osborne of the NLA.
+
+ Some documentation for this project is available at:
+
+ http://webteam.archive.org/confluence/display/wayback/Exclusions+API
+-->
+
+<!--
+ <bean name="8080:exclusion" parent="8080:wayback">
+ <property name="exclusionFactory">
+ <bean class="org.archive.wayback.accesscontrol.oracleclient.OracleExclusionFilterFactory">
+ <property name="oracleUrl" value="http://localhost:8180/oracle/" />
+ <property name="accessGroup" value="ia_archiver" />
+ </bean>
+ </property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/exclusion/" />
+ </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>
+ </property>
+
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost.archive.org:8080/netsecure/" />
+ </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...> - 2009-11-06 03:16:00
|
Revision: 2902
http://archive-access.svn.sourceforge.net/archive-access/?rev=2902&view=rev
Author: bradtofel
Date: 2009-11-06 03:15:50 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Updated comments and provided additional deployment examples.
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 2009-11-06 02:56:35 UTC (rev 2901)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2009-11-06 03:15:50 UTC (rev 2902)
@@ -24,7 +24,6 @@
The ResourceFileLocationDB implementation to use for mapping ARC/WARC names
to absolute paths/URLs via a BDBJE database.
-->
-
<bean id="resourcefilelocationdb" class="org.archive.wayback.resourcestore.locationdb.BDBResourceFileLocationDB">
<property name="bdbPath" value="${wayback.basedir}/file-db/db/" />
<property name="bdbName" value="DB1" />
@@ -32,6 +31,15 @@
</bean>
<!--
+ The following bean provides an alternate flat-file based LocationDB
+ implementation.
+-->
+<!--
+ <bean id="resourcefilelocationdb" class="org.archive.wayback.resourcestore.locationdb.FlatFileResourceFileLocationDB">
+ <property name="path" value="${wayback.basedir}/path-index.txt" />
+ </bean>
+-->
+<!--
To enable manual management of, or remote access to the above locationDB,
uncomment the following bean.
-->
@@ -47,11 +55,10 @@
Required when using the SimpleResourceStore to access distributed ARC/WARC
files over HTTP through a single reverse proxy.
-->
-<!--
+
<bean name="8080:fileproxy" class="org.archive.wayback.resourcestore.locationdb.FileProxyServlet">
<property name="locationDB" ref="resourcefilelocationdb" />
</bean>
--->
<!--
@@ -61,11 +68,21 @@
-->
<import resource="BDBCollection.xml"/>
<!--
- <import resource="NutchCollection.xml"/>
<import resource="CDXCollection.xml"/>
<import resource="RemoteCollection.xml"/>
+ <import resource="NutchCollection.xml"/>
-->
+<!--
+ LiveWeb.xml contains beans that enable fetching content from the live
+ web, and caching those results in ARC files. This import is needed if you
+ use the "excluder-factory-robot" exclusionFactory property of the
+ AccessPoints, which will cause live robots.txt files to be consulted
+ retroactively before showing archived content.
+-->
+<!--
+ <import resource="LiveWeb.xml"/>
+-->
<!--
This is the only AccessPoint defined by default within this wayback.xml
@@ -80,14 +97,26 @@
-->
<import resource="ArchivalUrlReplay.xml"/>
<bean name="8080:wayback" class="org.archive.wayback.webapp.AccessPoint">
+
<property name="collection" ref="localbdbcollection" />
+<!--
+ An example of a text file CDX collection, with a text file path index.
+ <property name="collection" ref="localcdxcollection" />
+-->
<property name="replay" ref="archivalurlreplay" />
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
<property name="captureJsp" value="/WEB-INF/query/CalendarResults.jsp" />
+<!--
+ This .jsp provides a "search engine" style listing of results vertically
+ <property name="captureJsp" value="/WEB-INF/query/HTMLCaptureResults.jsp" />
+-->
</bean>
</property>
+<!-- See the LiveWeb.xml import above.
+ <property name="exclusionFactory" ref="excluder-factory-robot" />
+-->
<property name="uriConverter">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
<property name="replayURIPrefix" value="http://localhost.archive.org:8080/wayback/"/>
@@ -97,15 +126,64 @@
<property name="parser">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser">
<property name="maxRecords" value="1000" />
- <property name="earliestTimestamp" value="1996" />
+ <!--
+ <property name="earliestTimestamp" value="1999" />
+ <property name="latestTimestamp" value="2004" />
+ -->
</bean>
</property>
-
+ <!--
+ The following property will cause only results matching the exact host
+ the user requested to be displayed. URLs matching other versions of the
+ same host will be stored in the closeMatches list of the SearchResults,
+ and can be displayed by query .jsp files.
+ -->
+ <!--
+ <property name="exactHostMatch" value="true" />
+ -->
</bean>
+
<!--
+
+ All beans defined below here represent examples of alternate
+ AccessPoint definitions and implementations.
+
+-->
+
+
+
+
+
+
+<!--
The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but provides a OpenSearch format query results.
+
+ Note: the links generated by this AccessPoint drive to the parent
+ 8080:wayback AccessPoint: presumably users following links from here
+ will prefer the HTML interface.
+ -->
+ <bean name="8080:opensearch" parent="8080:wayback">
+ <property name="urlRoot" value="http://localhost.archive.org:8080/wayback/" />
+ <property name="query">
+ <bean class="org.archive.wayback.query.Renderer">
+ <property name="captureJsp" value="/WEB-INF/query/OpenSearchCaptureResults.jsp" />
+ <property name="urlJsp" value="/WEB-INF/query/OpenSearchUrlResults.jsp" />
+ </bean>
+ </property>
+ <property name="exception">
+ <bean class="org.archive.wayback.exception.BaseExceptionRenderer">
+ <property name="xmlErrorJsp" value="/WEB-INF/exception/OpenSearchError.jsp" />
+ <property name="errorJsp" value="/WEB-INF/exception/OpenSearchError.jsp" />
+ </bean>
+ </property>
+ </bean>
+
+
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a DomainPrefix Replay UI to the same collection.
These two access points can be used simultaneously on the same Tomcat
installation.
@@ -144,7 +222,6 @@
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="urlRoot" value="http://localhost.archive.org:8090/" />
@@ -155,7 +232,7 @@
</bean>
</property>
<property name="parser">
- <bean class="org.archive.wayback.proxy.ProxyRequestParser">
+ <bean class="org.archive.wayback.proxy.ProxyArchivalRequestParser">
<property name="localhostNames">
<list>
<value>localhost.archive.org</value>
@@ -165,7 +242,31 @@
</bean>
</property>
</bean>
+
+ <bean name="8091" parent="8080:wayback">
+ <property name="urlRoot" value="http://localhost.archive.org/" />
+ <property name="replay" ref="proxyreplay" />
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost.archive.org/"/>
+ </bean>
+<!--
+ <bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
+ <property name="redirectURI" value="http://localhost.archive.org:8090/jsp/QueryUI/Redirect.jsp" />
+ </bean>
-->
+ </property>
+ <property name="parser">
+ <bean class="org.archive.wayback.proxy.ProxyArchivalRequestParser">
+ <property name="localhostNames">
+ <list>
+ <value>localhost.archive.org</value>
+ </list>
+ </property>
+ <property name="maxRecords" value="1000" />
+ </bean>
+ </property>
+ </bean>
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-10-11 20:39:22
|
Revision: 3282
http://archive-access.svn.sourceforge.net/archive-access/?rev=3282&view=rev
Author: bradtofel
Date: 2010-10-11 20:39:15 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
TWEAK: added Memento support configuration example, reorganized some fo the default configs..
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 2010-10-11 20:38:31 UTC (rev 3281)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2010-10-11 20:39:15 UTC (rev 3282)
@@ -15,11 +15,14 @@
<property name="properties">
<value>
wayback.basedir=/tmp/wayback
+ wayback.urlprefix=http://localhost.archive.org:8080/wayback/
</value>
</property>
</bean>
<bean id="waybackCanonicalizer" class="org.archive.wayback.util.url.AggressiveUrlCanonicalizer" />
+
+
<!--
The ResourceFileLocationDB implementation to use for mapping ARC/WARC names
to absolute paths/URLs via a BDBJE database.
@@ -29,7 +32,6 @@
<property name="bdbName" value="DB1" />
<property name="logPath" value="${wayback.basedir}/file-db/db.log" />
</bean>
-
<!--
The following bean provides an alternate flat-file based LocationDB
implementation.
@@ -55,17 +57,18 @@
Required when using the SimpleResourceStore to access distributed ARC/WARC
files over HTTP through a single reverse proxy.
-->
-
+<!--
<bean name="8080:fileproxy" class="org.archive.wayback.resourcestore.locationdb.FileProxyServlet">
<property name="locationDB" ref="resourcefilelocationdb" />
</bean>
+-->
-
<!--
The XML files indicated in the following import tags contain alternate
example implementations of WaybackCollections. To specify where your
ARC/WARC files are located, see the file BDBCollection.xml.
-->
+
<import resource="BDBCollection.xml"/>
<!--
<import resource="CDXCollection.xml"/>
@@ -73,18 +76,57 @@
<import resource="NutchCollection.xml"/>
-->
+
+
+
<!--
- LiveWeb.xml contains beans that enable fetching content from the live
- web, and caching those results in ARC files. This import is needed if you
- use the "excluder-factory-robot" exclusionFactory property of the
+ LiveWeb.xml contains the 'proxylivewebcache' bean that enable fetching
+ content from the live web, recording that content in ARC files.
+ To use the "excluder-factory-robot" bean as an exclusionFactory property of
AccessPoints, which will cause live robots.txt files to be consulted
- retroactively before showing archived content.
+ retroactively before showing archived content, you'll need to import
+ LiveWeb.xml as well.
-->
<!--
<import resource="LiveWeb.xml"/>
+ <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="proxylivewebcache" />
+ </bean>
-->
<!--
+ The 'excluder-factory-static' bean defines an exclusionFactory object which
+ consults a local text file containing either URLs or SURTs of content to
+ block from the ResourceIndex. These URLs or SURTs are treated as prefixes:
+ "http://www.archive.org/ima" will block anything starting with that string
+ from being returned from the index.
+-->
+<!--
+ <bean id="excluder-factory-static" class="org.archive.wayback.accesscontrol.staticmap.StaticMapExclusionFilterFactory">
+ <property name="file" value="/var/tmp/os-cdx/exclusion-2008-09-22-cleaned.txt" />
+ <property name="checkInterval" value="600000" />
+ </bean>
+-->
+
+<!--
+ The 'excluder-factory-composite' bean creates a single exclusionFactory
+ which restricts from both a static list of URLs, and also by live web
+ robots.txt documents.
+-->
+<!--
+ <bean id="excluder-factory-composite" class="org.archive.wayback.accesscontrol.CompositeExclusionFilterFactory">
+ <property name="factories">
+ <list>
+ <ref bean="excluder-factory-static" />
+ <ref bean="excluder-factory-robot" />
+ </list>
+ </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", defined in "BDBCollection.xml" by providing
@@ -96,13 +138,46 @@
with your fully qualified hostname of the computer running Tomcat.
-->
<import resource="ArchivalUrlReplay.xml"/>
+
+ <!--
+ Last ditch attempt to resolve server-relative URLs (/page1.htm) that were
+ not successfully rewritten, resolving them against the referring URL to
+ get them back on track.
+ -->
+ <bean name="+" class="org.archive.wayback.webapp.ServerRelativeArchivalRedirect">
+ <property name="matchPort" value="8080" />
+ <property name="useCollection" value="true" />
+ </bean>
+
<bean name="8080:wayback" class="org.archive.wayback.webapp.AccessPoint">
+ <property name="serveStatic" value="true" />
+ <property name="bounceToReplayPrefix" value="false" />
+ <property name="bounceToQueryPrefix" value="false" />
+ <!--
+ These properties enable customized handling of query, replay, and static
+ requests by different URL prefixes
+ -->
+
+ <property name="replayPrefix" value="${wayback.urlprefix}" />
+ <property name="queryPrefix" value="${wayback.urlprefix}" />
+ <property name="staticPrefix" value="${wayback.urlprefix}" />
+
+ <!--
+ The following property will cause only results matching the exact host
+ the user requested to be displayed. URLs matching other versions of the
+ same host will be stored in the closeMatches list of the SearchResults,
+ and can be displayed by query .jsp files.
+ -->
+ <!--
+ <property name="exactHostMatch" value="true" />
+ -->
+
<property name="collection" ref="localbdbcollection" />
<!--
- An example of a text file CDX collection, with a text file path index.
<property name="collection" ref="localcdxcollection" />
-->
+
<property name="replay" ref="archivalurlreplay" />
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
@@ -114,49 +189,99 @@
</bean>
</property>
-<!-- See the LiveWeb.xml import above.
- <property name="exclusionFactory" ref="excluder-factory-robot" />
--->
<property name="uriConverter">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost.archive.org:8080/wayback/"/>
+ <property name="replayURIPrefix" value="${wayback.urlprefix}"/>
</bean>
</property>
<property name="parser">
<bean class="org.archive.wayback.archivalurl.ArchivalUrlRequestParser">
- <property name="maxRecords" value="1000" />
+ <property name="maxRecords" value="10000" />
<!--
<property name="earliestTimestamp" value="1999" />
<property name="latestTimestamp" value="2004" />
-->
</bean>
</property>
- <!--
- The following property will cause only results matching the exact host
- the user requested to be displayed. URLs matching other versions of the
- same host will be stored in the closeMatches list of the SearchResults,
- and can be displayed by query .jsp files.
- -->
- <!--
- <property name="exactHostMatch" value="true" />
- -->
+
+<!-- See the LiveWeb.xml import above.
+ <property name="exclusionFactory" ref="excluder-factory-static" />
+-->
+
</bean>
-
<!--
-
+ ===========================================================
All beans defined below here represent examples of alternate
AccessPoint definitions and implementations.
+ ===========================================================
+-->
+
+<!--
+ The following import and two bean definitions enable Memento access to
+ content in your collections.
-->
+<!--
+ <import resource="MementoReplay.xml"/>
+ <bean name="8080:memento" parent="8080:wayback">
+ <property name="configs">
+ <props>
+ <prop key="aggregationPrefix">http://localhost.archive.org:8080/list/</prop>
+ </props>
+ </property>
+ <property name="replay" ref="mementoreplay" />
+ <property name="query">
+ <bean class="org.archive.wayback.query.Renderer">
+ <property name="captureJsp" value="/WEB-INF/query/Memento.jsp" />
+ </bean>
+ </property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost.archive.org:8080/memento/"/>
+ </bean>
+ </property>
+ <property name="parser">
+ <bean class="org.archive.wayback.memento.MementoRequestParser">
+ <property name="maxRecords" value="10000" />
+ <property name="earliestTimestamp" value="1996" />
+ </bean>
+ </property>
+ <property name="exception">
+ <bean class="org.archive.wayback.exception.BaseExceptionRenderer">
+ <property name="errorJsp" value="/WEB-INF/exception/TimegateError.jsp" />
+ </bean>
+ </property>
+ </bean>
+ <bean name="8080:list" parent="8080:memento">
+ <property name="staticPrefix" value="http://localhost.archive.org:8080/list/" />
+ <property name="configs">
+ <props>
+ <prop key="Prefix">http://localhost.archive.org:8080/memento/</prop>
+ </props>
+ </property>
+ <property name="replay" ref="archivalurlreplay" />
+ <property name="query">
+ <bean class="org.archive.wayback.query.Renderer">
+ <property name="captureJsp" value="/WEB-INF/query/ORE.jsp" />
+ </bean>
+ </property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://memento.localhost.archive.org:8080/list/"/>
+ </bean>
+ </property>
+ </bean>
+-->
+
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a OpenSearch format query results.
@@ -165,6 +290,7 @@
8080:wayback AccessPoint: presumably users following links from here
will prefer the HTML interface.
-->
+ <!--
<bean name="8080:opensearch" parent="8080:wayback">
<property name="urlRoot" value="http://localhost.archive.org:8080/wayback/" />
<property name="query">
@@ -180,7 +306,7 @@
</bean>
</property>
</bean>
-
+ -->
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
@@ -222,8 +348,14 @@
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">
+ <bean name="8090" parent="replay.wayback.localhost.archive.org:8080">
+ <property name="serveStatic" value="false" />
+ <property name="bounceToReplayPrefix" value="false" />
+ <property name="bounceToQueryPrefix" value="false" />
+ <property name="refererAuth" value="" />
+
<property name="urlRoot" value="http://localhost.archive.org:8090/" />
<property name="replay" ref="proxyreplay" />
<property name="uriConverter">
@@ -232,94 +364,17 @@
</bean>
</property>
<property name="parser">
- <bean class="org.archive.wayback.proxy.ProxyArchivalRequestParser">
+ <bean class="org.archive.wayback.proxy.ProxyRequestParser">
<property name="localhostNames">
<list>
<value>localhost.archive.org</value>
</list>
</property>
<property name="maxRecords" value="1000" />
+ <property name="addDefaults" value="false" />
</bean>
</property>
</bean>
-
- <bean name="8091" parent="8080:wayback">
- <property name="urlRoot" value="http://localhost.archive.org/" />
- <property name="replay" ref="proxyreplay" />
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost.archive.org/"/>
- </bean>
-<!--
- <bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://localhost.archive.org:8090/jsp/QueryUI/Redirect.jsp" />
- </bean>
-->
- </property>
- <property name="parser">
- <bean class="org.archive.wayback.proxy.ProxyArchivalRequestParser">
- <property name="localhostNames">
- <list>
- <value>localhost.archive.org</value>
- </list>
- </property>
- <property name="maxRecords" value="1000" />
- </bean>
- </property>
- </bean>
-<!--
- The following AccessPoint inherits all configuration from the 8080:wayback
- AccessPoint, but uses an Access Control Oracle to determine if archived
- content should be accessible.
-
- The Access Control Oracle was developed by Alex Osborne of the NLA.
-
- Some documentation for this project is available at:
-
- http://webteam.archive.org/confluence/display/wayback/Exclusions+API
--->
-
-<!--
- <bean name="8080:exclusion" parent="8080:wayback">
- <property name="exclusionFactory">
- <bean class="org.archive.wayback.accesscontrol.oracleclient.OracleExclusionFilterFactory">
- <property name="oracleUrl" value="http://localhost:8180/oracle/" />
- <property name="accessGroup" value="ia_archiver" />
- </bean>
- </property>
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost:8080/exclusion/" />
- </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>
- </property>
-
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost.archive.org:8080/netsecure/" />
- </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...> - 2010-10-22 23:48:03
|
Revision: 3301
http://archive-access.svn.sourceforge.net/archive-access/?rev=3301&view=rev
Author: bradtofel
Date: 2010-10-22 23:47:57 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
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 2010-10-22 23:47:16 UTC (rev 3300)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2010-10-22 23:47:57 UTC (rev 3301)
@@ -323,7 +323,7 @@
<!--
<import resource="DomainPrefixReplay.xml"/>
<bean name="8081" parent="8080:wayback">
- <property name="urlRoot" value="http://localhost.archive.org:8081/" />
+ <property name="queryRoot" value="http://localhost.archive.org:8081/" />
<property name="replay" ref="domainprefixreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.domainprefix.DomainPrefixResultURIConverter">
@@ -356,7 +356,7 @@
<property name="bounceToQueryPrefix" value="false" />
<property name="refererAuth" value="" />
- <property name="urlRoot" value="http://localhost.archive.org:8090/" />
+ <property name="queryRoot" value="http://localhost.archive.org:8090/" />
<property name="replay" ref="proxyreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-11-11 05:47:31
|
Revision: 3331
http://archive-access.svn.sourceforge.net/archive-access/?rev=3331&view=rev
Author: bradtofel
Date: 2010-11-11 05:47:25 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
BUGFIX: was not sending correct URL prefixes for timemaps. Split out replayPrefix and queryPrefix for timegate and timemaps, respectively
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 2010-11-11 05:29:16 UTC (rev 3330)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2010-11-11 05:47:25 UTC (rev 3331)
@@ -227,6 +227,8 @@
<!--
<import resource="MementoReplay.xml"/>
<bean name="8080:memento" parent="8080:wayback">
+ <property name="replayPrefix" value="http://localhost.archive.org:8080/memento/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8080/list/" />
<property name="configs">
<props>
<prop key="aggregationPrefix">http://localhost.archive.org:8080/list/</prop>
@@ -260,6 +262,8 @@
<bean name="8080:list" parent="8080:memento">
+ <property name="replayPrefix" value="http://localhost.archive.org:8080/memento/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8080/list/" />
<property name="staticPrefix" value="http://localhost.archive.org:8080/list/" />
<property name="configs">
<props>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 21:42:14
|
Revision: 3366
http://archive-access.svn.sourceforge.net/archive-access/?rev=3366&view=rev
Author: bradtofel
Date: 2011-01-03 21:42:08 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
config: fixed proxy mode default config options.. was broken pretty badly before
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 2011-01-03 21:40:21 UTC (rev 3365)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2011-01-03 21:42:08 UTC (rev 3366)
@@ -352,15 +352,17 @@
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="replay.wayback.localhost.archive.org:8080">
- <property name="serveStatic" value="false" />
+ <bean name="8090" parent="8080:wayback">
+ <property name="serveStatic" value="true" />
<property name="bounceToReplayPrefix" value="false" />
<property name="bounceToQueryPrefix" value="false" />
<property name="refererAuth" value="" />
- <property name="queryRoot" value="http://localhost.archive.org:8090/" />
+ <property name="staticPrefix" value="http://localhost.archive.org:8090/" />
+ <property name="replayPrefix" value="http://localhost.archive.org:8090/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8090/" />
<property name="replay" ref="proxyreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-01-03 22:04:04
|
Revision: 3368
http://archive-access.svn.sourceforge.net/archive-access/?rev=3368&view=rev
Author: bradtofel
Date: 2011-01-03 22:03:58 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
CONFIG: updated old urlRoot and queryRoot configs to queryPrefix, etc..
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 2011-01-03 22:02:47 UTC (rev 3367)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2011-01-03 22:03:58 UTC (rev 3368)
@@ -296,7 +296,7 @@
-->
<!--
<bean name="8080:opensearch" parent="8080:wayback">
- <property name="urlRoot" value="http://localhost.archive.org:8080/wayback/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8080/opensearch/" />
<property name="query">
<bean class="org.archive.wayback.query.Renderer">
<property name="captureJsp" value="/WEB-INF/query/OpenSearchCaptureResults.jsp" />
@@ -327,7 +327,9 @@
<!--
<import resource="DomainPrefixReplay.xml"/>
<bean name="8081" parent="8080:wayback">
- <property name="queryRoot" value="http://localhost.archive.org:8081/" />
+ <property name="queryPrefix" value="http://localhost.archive.org:8081/" />
+ <property name="replayPrefix" value="http://localhost.archive.org:8081/" />
+ <property name="staticPrefix" value="http://localhost.archive.org:8081/" />
<property name="replay" ref="domainprefixreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.domainprefix.DomainPrefixResultURIConverter">
@@ -342,7 +344,6 @@
</property>
</bean>
-->
-
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a Proxy Replay UI to the same collection. These
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