From be2f974a4cccf6c46ccc4fab494c0e79165cd75b Mon Sep 17 00:00:00 2001
From: Eric van der Vlist <vdv@dyomedea.com>
Date: Sat, 21 Apr 2012 22:51:58 +0200
Subject: [PATCH] Update to follow changes to Orbeon Forms experimental
 features...

---
 .../actions/heritrix-archive-set.xpl          | 13 ++++++------
 archiver/pipelines/config.xml                 |  4 +++-
 archiver/pipelines/data-access.xpl            |  2 +-
 archiver/pipelines/default-log4j.xml          | 10 ++++-----
 archiver/pipelines/properties.xml             | 21 +++++++------------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/archiver/pipelines/actions/heritrix-archive-set.xpl b/archiver/pipelines/actions/heritrix-archive-set.xpl
index b3693e4..00adcee 100644
--- a/archiver/pipelines/actions/heritrix-archive-set.xpl
+++ b/archiver/pipelines/actions/heritrix-archive-set.xpl
@@ -96,12 +96,13 @@ for $a in /queue/action where $a/@uuid = $(uuid) return
     <!-- Create a new Heritrix job-->
     <p:processor name="oxf:xforms-submission">
         <p:input name="submission" transform="oxf:xslt" href="oxf:/config.xml">
-            <xforms:submission xsl:version="2.0" method="urlencoded-post" replace="none" action="{/config/heritrix/rest-api}" xxforms:authentication-scheme="digest">
-<xforms:header combine="replace"> 
-    <xforms:name>Accept</xforms:name>
-    <xforms:value>application/xml</xforms:value> 
-  </xforms:header> 
-</xforms:submission>
+            <xforms:submission xsl:version="2.0" method="urlencoded-post" action="{/config/heritrix/rest-api}" xxforms:username="{/config/heritrix/username}"
+                xxforms:password="{/config/heritrix/password}" xxforms:preemptive_authentication="no">
+                <xforms:header combine="replace">
+                    <xforms:name>Accept</xforms:name>
+                    <xforms:value>application/xml</xforms:value>
+                </xforms:header>
+            </xforms:submission>
         </p:input>
         <p:input name="request" transform="oxf:xslt" href="#data">
             <instance xsl:version="2.0">
diff --git a/archiver/pipelines/config.xml b/archiver/pipelines/config.xml
index 6894fe3..3ea9597 100644
--- a/archiver/pipelines/config.xml
+++ b/archiver/pipelines/config.xml
@@ -7,7 +7,9 @@
     <user-agent>Mozilla/5.0 (compatible; owark/0.3; http://owark.org/)</user-agent>
 
     <heritrix>
-        <rest-api>https://admin:envierse@localhost:8443/engine</rest-api>
+        <rest-api>https://localhost:8443/engine</rest-api>
+        <username>admin</username>
+        <password>envierse</password>
     </heritrix>
 
 </config>
diff --git a/archiver/pipelines/data-access.xpl b/archiver/pipelines/data-access.xpl
index 7621df5..5b51749 100644
--- a/archiver/pipelines/data-access.xpl
+++ b/archiver/pipelines/data-access.xpl
@@ -3,7 +3,7 @@
     Database access
 
 -->
-<p:config xmlns:p="http://www.orbeon.com/oxf/pipeline" xmlns:oxf="http://www.orbeon.com/oxf/processors" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<p:config xmlns:p="http://www.orbeon.com/oxf/pipeline" xmlns:oxf="http://www.orbeon.com/oxf/processors" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xxforms="http://orbeon.org/oxf/xml/xforms" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exist="http://exist.sourceforge.net/NS/exist" xmlns:saxon="http://saxon.sf.net/">
 
 
diff --git a/archiver/pipelines/default-log4j.xml b/archiver/pipelines/default-log4j.xml
index 28dc26f..db0476d 100644
--- a/archiver/pipelines/default-log4j.xml
+++ b/archiver/pipelines/default-log4j.xml
@@ -20,13 +20,13 @@
             <param name="ConversionPattern" value="%d{ISO8601} %-5p %c %x - %m%n"/>
         </layout>
         <filter class="org.apache.log4j.varia.LevelRangeFilter">
-            <param name="LevelMin" value="INFO" />
+            <param name="LevelMin" value="INFO"/>
         </filter>
     </appender>
-<!-- XForms engine activity -->
-<category name="org.orbeon.oxf.xforms.processor.XFormsServer">
-    <priority value="debug"/>
-</category>
+    <!-- XForms engine activity -->
+    <category name="org.orbeon.oxf.xforms.processor.XFormsServer">
+        <priority value="debug"/>
+    </category>
 
     <!-- This is the root logger -->
     <root>
diff --git a/archiver/pipelines/properties.xml b/archiver/pipelines/properties.xml
index 3dc77fc..dcebaa7 100644
--- a/archiver/pipelines/properties.xml
+++ b/archiver/pipelines/properties.xml
@@ -11,24 +11,17 @@
 
     The full text of the license is available at http://www.gnu.org/copyleft/lesser.html
 -->
-<properties xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:oxf="http://www.orbeon.com/oxf/processors">
+<properties xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:oxf="http://www.orbeon.com/oxf/processors">
 
-    <property as="xs:anyURI"  name="oxf.log4j-config"                                value="oxf:/default-log4j.xml"/>
-    <property as="xs:integer" name="oxf.cache.size"                                  value="200"/>
+    <property as="xs:anyURI" name="oxf.log4j-config" value="oxf:/default-log4j.xml"/>
+    <property as="xs:integer" name="oxf.cache.size" value="200"/>
 
 
-    <property as="xs:anyURI"
-        name="oxf.http.ssl.keystore.uri"
-        value="file:/var/local/heritrix-3.1.0/heritrix.keystore"/>
-    <property as="xs:string"
-        name="oxf.http.ssl.keystore.password"
-        value="heritrix"/>
-    <property as="xs:string"
-        name="oxf.http.ssl.hostname-verifier"
-        value="allow-all"/>
+    <property as="xs:anyURI" name="oxf.http.ssl.keystore.uri" value="file:/var/local/heritrix-3.1.0/heritrix.keystore"/>
+    <property as="xs:string" name="oxf.http.ssl.keystore.password" value="heritrix"/>
+    <property as="xs:string" name="oxf.http.ssl.hostname-verifier" value="allow-all"/>
 
-<!--<property as="xs:NMTOKENS" name="oxf.xforms.logging.debug"
+    <!--<property as="xs:NMTOKENS" name="oxf.xforms.logging.debug"
     value="document model submission control event action analysis server server-body html resolver utils 
            submission-details submission-body"/>-->
 </properties>