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. |