Also accept .htm as extension.

orbeon · Sep 27, 2011 · 235d0e6 · 235d0e6
1 parent d7504f4
commit 235d0e6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/resources-packaged/ops/xforms/xforms-renderer-page-flow.xml b/src/resources-packaged/ops/xforms/xforms-renderer-page-flow.xml
@@ -16,7 +16,7 @@
 
     <!-- Files to serve directly (and exclude files under /[app]/service/) -->
     <!-- NOTE: We leave this here so that the page flow creates the list of path matchers for XForms versioned resources -->
-    <files path-info="(?!/([^/]+)/service/).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|txt)" matcher="oxf:perl5-matcher"/>
+    <files path-info="(?!/([^/]+)/service/).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|htm|txt)" matcher="oxf:perl5-matcher"/>
 
     <!-- This should be the only path matched  -->
     <page id="renderer" path-info="/xforms-renderer" model="xforms-renderer.xpl"/>

diff --git a/src/resources/page-flow-portlet-edit.xml b/src/resources/page-flow-portlet-edit.xml
@@ -15,7 +15,7 @@
         xmlns:oxf="http://www.orbeon.com/oxf/processors">
 
     <!-- Files to serve directly (and exclude files under /[app]/service/) -->
-    <files path-info="(?!/(xforms-server|([^/]+)/service/)).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|txt)" matcher="oxf:perl5-matcher"/>
+    <files path-info="(?!/(xforms-server|([^/]+)/service/)).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|htm|txt)" matcher="oxf:perl5-matcher"/>
     <!-- Also exclude .xml files handled by Form Runner -->
     <files path-info="(?!/(xforms-server|fr|([^/]+)/service)/).+\.xml" matcher="oxf:perl5-matcher" mime-type="application/xml"/>
     <!-- For the following we override the standard mediatype to help browsers -->

diff --git a/src/resources/page-flow-portlet.xml b/src/resources/page-flow-portlet.xml
@@ -15,7 +15,7 @@
         xmlns:oxf="http://www.orbeon.com/oxf/processors">
 
     <!-- Files to serve directly (and exclude files under /[app]/service/) -->
-    <files path-info="(?!/(xforms-server|([^/]+)/service/)).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|txt)" matcher="oxf:perl5-matcher"/>
+    <files path-info="(?!/(xforms-server|([^/]+)/service/)).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|htm|txt)" matcher="oxf:perl5-matcher"/>
     <!-- Also exclude .xml files handled by Form Runner -->
     <files path-info="(?!/(xforms-server|fr|([^/]+)/service)/).+\.xml" matcher="oxf:perl5-matcher" mime-type="application/xml"/>
     <!-- For the following we override the standard mediatype to help browsers -->

diff --git a/src/resources/page-flow.xml b/src/resources/page-flow.xml
@@ -15,7 +15,7 @@
         xmlns:oxf="http://www.orbeon.com/oxf/processors">
 
     <!-- Files to serve directly (and exclude files under /[app]/service/) -->
-    <files path-info="(?!/([^/]+)/service/).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|txt)" matcher="oxf:perl5-matcher"/>
+    <files path-info="(?!/([^/]+)/service/).+\.(gif|css|pdf|json|js|png|jpg|xsd|htc|ico|swf|html|htm|txt)" matcher="oxf:perl5-matcher"/>
     <!-- Also exclude .xml files handled by Form Runner -->
     <files path-info="(?!/(fr|([^/]+)/service)/).+\.xml" matcher="oxf:perl5-matcher" mime-type="application/xml"/>
     <!-- For the following we override the standard mediatype to help browsers -->