From dd4bf9a910f33f68b6d64fdcbafb5ac2fdccac3c Mon Sep 17 00:00:00 2001
From: szznax <szznax@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Mon, 9 Aug 2010 21:22:50 +0000
Subject: [PATCH] correct canonicalizationPolicy bean template per
 archive-crawler msg 6649 * profile-crawler-beans.cxml,
 migrate-template-crawler-beans.cxml     surround canonicalizationPolicy list
 with property element

---
 .../migrate-template-crawler-beans.cxml        | 18 ++++++++++--------
 .../crawler/restlet/profile-crawler-beans.cxml | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/engine/src/main/resources/org/archive/crawler/migrate/migrate-template-crawler-beans.cxml b/engine/src/main/resources/org/archive/crawler/migrate/migrate-template-crawler-beans.cxml
index cc2da902..252157af 100644
--- a/engine/src/main/resources/org/archive/crawler/migrate/migrate-template-crawler-beans.cxml
+++ b/engine/src/main/resources/org/archive/crawler/migrate/migrate-template-crawler-beans.cxml
@@ -405,14 +405,16 @@
  <!--
  <bean id="canonicalizationPolicy" 
    class="org.archive.modules.canonicalize.RulesCanonicalizationPolicy">
-  <list>
-   <bean class="org.archive.modules.canonicalize.LowercaseRule" />
-   <bean class="org.archive.modules.canonicalize.StripUserinfoRule" />
-   <bean class="org.archive.modules.canonicalize.StripWWWNRule" />
-   <bean class="org.archive.modules.canonicalize.StripSessionIDs" />
-   <bean class="org.archive.modules.canonicalize.StripSessionCFIDs" />
-   <bean class="org.archive.modules.canonicalize.FixupQueryString" />
-  </list>
+  <property name="rules">
+   <list>
+    <bean class="org.archive.modules.canonicalize.LowercaseRule" />
+    <bean class="org.archive.modules.canonicalize.StripUserinfoRule" />
+    <bean class="org.archive.modules.canonicalize.StripWWWNRule" />
+    <bean class="org.archive.modules.canonicalize.StripSessionIDs" />
+    <bean class="org.archive.modules.canonicalize.StripSessionCFIDs" />
+    <bean class="org.archive.modules.canonicalize.FixupQueryString" />
+   </list>
+  </property>
  </bean>
  -->
  
diff --git a/engine/src/main/resources/org/archive/crawler/restlet/profile-crawler-beans.cxml b/engine/src/main/resources/org/archive/crawler/restlet/profile-crawler-beans.cxml
index f3894a4b..319a150d 100644
--- a/engine/src/main/resources/org/archive/crawler/restlet/profile-crawler-beans.cxml
+++ b/engine/src/main/resources/org/archive/crawler/restlet/profile-crawler-beans.cxml
@@ -425,14 +425,16 @@ http://example.example/example
  <!--
  <bean id="canonicalizationPolicy" 
    class="org.archive.modules.canonicalize.RulesCanonicalizationPolicy">
-  <list>
-   <bean class="org.archive.modules.canonicalize.LowercaseRule" />
-   <bean class="org.archive.modules.canonicalize.StripUserinfoRule" />
-   <bean class="org.archive.modules.canonicalize.StripWWWNRule" />
-   <bean class="org.archive.modules.canonicalize.StripSessionIDs" />
-   <bean class="org.archive.modules.canonicalize.StripSessionCFIDs" />
-   <bean class="org.archive.modules.canonicalize.FixupQueryString" />
-  </list>
+  <property name="rules">
+   <list>
+    <bean class="org.archive.modules.canonicalize.LowercaseRule" />
+    <bean class="org.archive.modules.canonicalize.StripUserinfoRule" />
+    <bean class="org.archive.modules.canonicalize.StripWWWNRule" />
+    <bean class="org.archive.modules.canonicalize.StripSessionIDs" />
+    <bean class="org.archive.modules.canonicalize.StripSessionCFIDs" />
+    <bean class="org.archive.modules.canonicalize.FixupQueryString" />
+   </list>
+  </property>
  </bean>
  -->