Merged V2.1 to HEAD

6817: Fix for a resource bundle isue with regen renditions wizard and snapshot labels.
   6809: Fixes for locking and permission related issues relating to forms.
   6808: Uunit test update
   6799: AR-1760: Office webscript : property is undefined when opening a document
   6799: WCM submit dialog now sets focus to first field (label) rather than second (comment)
   6795: Fix to line break encoder.
   6781: WebDAV auth to return HTTP 401 instead of exception when user is null
   6775: Fix for appserver shutdown hang
   6761: Using avmService instead of nodeService to avoid a permission error MIT is seeing.
   6742: Fix for MIT locking issue for content contributors
   6706: Fixes to make wizard pages work in standards compliant mode.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/forms/XMLUtil.java

@@ -33,6 +33,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -94,7 +95,7 @@ public class XMLUtil
          assert false : te.getMessage();
       }
    }
-   
+
    /** utility function for serializing a node */
    public static void print(final Node n, final File output)
       throws IOException
@@ -135,6 +136,16 @@ public class XMLUtil
       final InputStream in = contentReader.getContentInputStream();
       return XMLUtil.parse(in);
    }
+
+   /** utility function for parsing xml */
+   public static Document parse(final int version, 
+                                final String path,
+                                final AVMService avmService)
+      throws SAXException,
+      IOException
+   {
+      return XMLUtil.parse(avmService.getFileInputStream(version, path));
+   }
    
    /** utility function for parsing xml */
    public static Document parse(final File source)