[Archive-access-cvs] SF.net SVN: archive-access:[2909] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF

[<bra...@us...>]

Revision: 2909
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2909&view=rev
Author:   bradtofel
Date:     2009-11-07 01:08:15 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
TWEAK: now we define a global canonicalizer bean, which is referred to in (hopefully) all the right places

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml
    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/BDBCollection.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml	2009-11-07 01:07:21 UTC (rev 2908)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml	2009-11-07 01:08:15 UTC (rev 2909)
@@ -55,6 +55,7 @@
     A LocalResourceIndex bean using a BDBIndex SearchResultSource.
 -->
   <bean id="localbdbresourceindex" class="org.archive.wayback.resourceindex.LocalResourceIndex">
+    <property name="canonicalizer" ref="waybackCanonicalizer" />
     <property name="source">
       <bean class="org.archive.wayback.resourceindex.bdb.BDBIndex">
         <property name="bdbName" value="DB1" />
@@ -117,6 +118,7 @@
               <property name="target" value="${wayback.basedir}/index-data/incoming/" />
             </bean>
           </property>
+          <property name="canonicalizer" ref="waybackCanonicalizer"/>
         </bean>
         
         <!-- This thread merges updates from the indexworker into the ResourceIndex -->

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml	2009-11-07 01:07:21 UTC (rev 2908)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/CDXCollection.xml	2009-11-07 01:08:15 UTC (rev 2909)
@@ -40,6 +40,7 @@
 
     <property name="resourceIndex">
       <bean class="org.archive.wayback.resourceindex.LocalResourceIndex">
+        <property name="canonicalizer" ref="waybackCanonicalizer" />
         <property name="source">
 
           <bean class="org.archive.wayback.resourceindex.cdx.CDXIndex">

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-07 01:07:21 UTC (rev 2908)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml	2009-11-07 01:08:15 UTC (rev 2909)
@@ -19,7 +19,7 @@
     </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.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.