Merge branch 'candidate-8.2.x' into candidate-8.4.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

ecl/eclcc/eclcc.cpp

@@ -853,7 +853,8 @@ void gatherResourceManifestFilenames(EclCompileInstance & instance, StringArray
             getFullFileName(filename, true).append(".manifest");
             if (filenames.contains(filename))
                 continue;
-            if (checkFileExists(filename))
+            Owned<IFile> manifest = createIFile(filename);
+            if (manifest->exists())
                 filenames.append(filename);
         }
     }

ecl/hql/hqlmanifest.cpp

@@ -31,7 +31,8 @@ public:
     {
         try
         {
-            fileContents.loadFile(filename, false);
+            Owned<IFile> ifile = createIFile(filename);
+            fileContents.loadFile(ifile);
             const char *xml = fileContents.str();
             StringBuffer body;
             // Check for signature
@@ -180,7 +181,8 @@ bool ResourceManifest::checkResourceFilesExist()
     ForEach(*resources)
     {
         const char *filepath = resources->query().queryProp("@originalFilename");
-        if (!checkFileExists(filepath))
+        Owned<IFile> ifile = createIFile(filepath);
+        if (!ifile->exists())
         {
             UERRLOG("Error: RESOURCE file '%s' does not exist", filepath);
             return false;
@@ -272,7 +274,8 @@ void addManifestResourcesToArchive(IPropertyTree *archive, const char *filename)
 
 bool isManifestFileValid(const char *filename)
 {
-    if (!checkFileExists(filename))
+    Owned<IFile> ifile = createIFile(filename);
+    if (!ifile->exists())
     {
         UERRLOG("Error: MANIFEST file '%s' does not exist", filename);
         return false;

ecl/hqlcpp/hqlres.cpp

@@ -171,7 +171,8 @@ void ResourceManager::addManifestFile(const char *filename, ICodegenContextCallb
 {
     StringBuffer fileContents;
     StringBuffer strippedFileContents;
-    fileContents.loadFile(filename, false);
+    Owned<IFile> manifestFile = createIFile(filename);
+    fileContents.loadFile(manifestFile);
     bool isSigned = false;
     const char *useContents = fileContents;
     // Check for signature