From f40f0f02d6b357be8d818f65e817413f9db02880 Mon Sep 17 00:00:00 2001
From: John Eberhard <jeber@us.ibm.com>
Date: Wed, 13 May 2026 14:36:21 -0500
Subject: [PATCH] Testcase cleanup

Signed-off-by: John Eberhard <jeber@us.ibm.com>
---
 README.testing.txt                   |   2 +-
 pom.xml                              |  13 +--
 pomWar.xml                           |  12 +-
 src/test/AllQshCompileScript         |   5 +-
 src/test/IFS/IFSGenericTestcase.java |  12 +-
 src/test/JCIFSUtility.java           | 167 +++++++++++++++------------
 src/test/JDReflectionUtil.java       |  24 ++++
 src/test/JDReport.java               |  31 ++++-
 src/test/JDRunit.java                |  33 +++++-
 src/test/JDSQL400.java               |   4 +-
 src/test/JTOpenTestSetup.java        |   4 +-
 11 files changed, 203 insertions(+), 104 deletions(-)

diff --git a/README.testing.txt b/README.testing.txt
index 0ad559bb..d64c21fb 100644
--- a/README.testing.txt
+++ b/README.testing.txt
@@ -95,7 +95,7 @@ JDRunit setup.
 11. Copy the ini/runitxx8Sx.ini to a file that represents the JVM used for the test.  The 8S is a sample configuration for a Java 8 test on a PC. 
 12. Download the latest JTOpen release. 
     java -cp JTOpen-test.jar test.JTOpenDownloadReleaseJars
-13. For the IFS tests, get a copy of jcifs.jar and copy into the jar directory.   
+13. For the NetServer tests, get a copy of jcifs-3.0.2.jar and copy into the jar directory.   
 14. Copy the java certificate store to $JTOPEN_TEST_DIR. Add the necessary certificates in order to establish 
     secure (TLS) connections to the server you are testing.   
 
diff --git a/pom.xml b/pom.xml
index 1567445c..944721b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,12 +65,11 @@
     <scope>provided</scope>
 	</dependency>
  
-    <dependency>
-      <groupId>org.codelibs</groupId>
-      <artifactId>jcifs</artifactId>
-      <version>1.3.18.3</version>
-    </dependency>
-
-  </dependencies>
+<dependency>
+    <groupId>org.codelibs</groupId>
+    <artifactId>jcifs</artifactId>
+    <version>3.0.2</version>
+    <scope>compile</scope>
+</dependency>  </dependencies>
 </project>
 
diff --git a/pomWar.xml b/pomWar.xml
index 947d0ba9..24ddd52a 100644
--- a/pomWar.xml
+++ b/pomWar.xml
@@ -63,12 +63,12 @@
     <artifactId>jakarta.servlet-api</artifactId>
     <version>6.0.0</version>
 </dependency>
-    <dependency>
-      <groupId>org.codelibs</groupId>
-      <artifactId>jcifs</artifactId>
-      <version>1.3.18.3</version>
-    </dependency>
-<!--    <dependency>
+<dependency>
+    <groupId>org.codelibs</groupId>
+    <artifactId>jcifs</artifactId>
+    <version>3.0.2</version>
+    <scope>compile</scope>
+</dependency><!--    <dependency>
       <groupId>com.sun</groupId>
       <artifactId>tools</artifactId>
       <version>1.8</version>
diff --git a/src/test/AllQshCompileScript b/src/test/AllQshCompileScript
index a52d3565..07164707 100644
--- a/src/test/AllQshCompileScript
+++ b/src/test/AllQshCompileScript
@@ -9,7 +9,7 @@ echo UNAME is $UNAME
 #
 UVERSION=`uname -v`
 URELEASE=`uname -r`
-CLASSPATH=".:/qibm/proddata/http/public/jt400/lib/java8/jt400.jar:/qibm/proddata/http/public/jt400/lib/jt400Servlet.jar:/home/jdbctest/jars/servlet.jar:/home/jdbctest/jars/sslightx.zip:/qibm/proddata/os400/java400/jdk/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk60/32bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/32bit/lib/tools.jar:./db2_classes.jar:/qibm/proddata/os400/java400/ext/mail.jar:/qibm/proddata/os400/java400/ext/activation.jar:/home/jdbctest/jars/jcifs.jar:/home/jdbctest/jars/jakarta.servlet-api-5.0.0.jar"
+CLASSPATH=".:/qibm/proddata/http/public/jt400/lib/java8/jt400.jar:/qibm/proddata/http/public/jt400/lib/jt400Servlet.jar:/home/jdbctest/jars/servlet.jar:/home/jdbctest/jars/sslightx.zip:/qibm/proddata/os400/java400/jdk/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk60/32bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/lib/tools.jar:/QOpenSys/QIBM/ProdData/JavaVM/jdk80/32bit/lib/tools.jar:./db2_classes.jar:/qibm/proddata/os400/java400/ext/mail.jar:/qibm/proddata/os400/java400/ext/activation.jar:/home/jdbctest/jars/jcifs-3.0.2.jar:/home/jdbctest/jars/jakarta.servlet-api-5.0.0.jar"
 
 
 
@@ -94,7 +94,8 @@ do #
   echo UVERSION is $UVERSION
   echo UNAME is '"'$UNAME'"'
   echo URELEASE is '"'$URELEASE'"'
-  JAVA_HOME=/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit
+  # Compile now with Java 17 for Jjcifs-3.0.2
+  JAVA_HOME=/QOpenSys/QIBM/ProdData/JavaVM/jdk17/64bit
   export JAVA_HOME
   echo JAVA_HOME is $JAVA_HOME
   echo "javac -classpath $CLASSPATH -g -source 1.8  -target 1.8 $files"
diff --git a/src/test/IFS/IFSGenericTestcase.java b/src/test/IFS/IFSGenericTestcase.java
index 292c901b..04a420f6 100644
--- a/src/test/IFS/IFSGenericTestcase.java
+++ b/src/test/IFS/IFSGenericTestcase.java
@@ -29,13 +29,13 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
+
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.access.AS400JDBCDriver;
 import com.ibm.as400.access.IFSFile;
 import com.ibm.as400.access.IFSFileOutputStream;
 import com.ibm.as400.access.IFSRandomAccessFile;
 
-import jcifs.smb.SmbException;
 import test.IFSTests;
 import test.JCIFSUtility;
 import test.JTOpenTestEnvironment;
@@ -1152,7 +1152,7 @@ public final void deleteIFSFile(String pathName)
 
 
 
-  public InputStream getNonIFSInputStream(String ifsPathName) throws FileNotFoundException, SmbException, MalformedURLException, UnknownHostException, SQLException {
+  public InputStream getNonIFSInputStream(String ifsPathName) throws Exception {
       InputStream fis = null; 
       if (IFSTests.IsRunningOnOS400) {
 	  fis = new FileInputStream(ifsPathName); 
@@ -1240,6 +1240,7 @@ public long checkFileLength(String ifsPathNameX) throws Exception {
   	// return (file.length());
       }
   }
+  
 
   public boolean checkExpectedRead2(String ifsPathNameX, int x1, int x2) throws Exception  {  
     boolean passed = false; 
@@ -1253,12 +1254,11 @@ public boolean checkExpectedRead2(String ifsPathNameX, int x1, int x2) throws Ex
     }
 
   public DataInput openDataInput(String ifsPathNameX, String mode) throws Exception  {  
+    
     return JCIFSUtility.openDataInput(systemName_, userId_, encryptedPassword_, ifsPathNameX, mode); 
-    }
+    
+  }
 
-//  public DataOutput openDataOutput(String ifsPathNameX, String mode) throws Exception  {  
-//    return JCIFSUtility.openDataOutput(systemName_, userId_, encryptedPassword_, ifsPathNameX, mode); 
-//     }
   
   
 }
diff --git a/src/test/JCIFSUtility.java b/src/test/JCIFSUtility.java
index 10d6fd8e..58da8d74 100644
--- a/src/test/JCIFSUtility.java
+++ b/src/test/JCIFSUtility.java
@@ -26,15 +26,11 @@
 import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.UnknownHostException;
 import java.sql.Blob;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -43,19 +39,16 @@
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Date;
-import java.util.Hashtable;
-
 import java.util.Enumeration;
+import java.util.Hashtable;
 
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.access.AS400JDBCDriver;
 import com.ibm.as400.access.ISeriesNetServer;
 import com.ibm.as400.access.ISeriesNetServerFileShare;
 
-import jcifs.smb.*;
-
 public class JCIFSUtility {
-
+  public static String JCIFS_PACKAGE_PREFIX="org.codelibs.jcifs.smb.impl.";
   public static boolean debug = false;
   public static boolean useJdbc = true;
   private static Connection jdbcConnection_;
@@ -72,9 +65,10 @@ public class JCIFSUtility {
     }
 
     // Turn on extended security.
-    jcifs.Config.setProperty("jcifs.util.loglevel", "3");
-    jcifs.Config.setProperty("jcifs.smb.client.useExtendedSecurity", "false");
-    jcifs.Config.setProperty("jcifs.smb.lmCompatibility", "0");
+    // SingletonContext config = org.codelibs.jcifs.smb.context.SingletonContext.getInstance();
+    // config.setProperty("jcifs.util.loglevel", "3");
+    // jcifs.Config.setProperty("jcifs.smb.client.useExtendedSecurity", "false");
+    // jcifs.Config.setProperty("jcifs.smb.lmCompatibility", "0");
 
   }
 
@@ -113,7 +107,7 @@ public static void createFile(String system, String userId, char[] encryptedPass
       ps.execute();
       ps.close();
     } else {
-      SmbFileOutputStream outputStream = null;
+      OutputStream outputStream = null;
 
       String url;
       system = fullyQualifySystem(system);
@@ -126,9 +120,10 @@ public static void createFile(String system, String userId, char[] encryptedPass
         int retryCount = 20;
         while (retryCount > 0) {
           try {
-            outputStream = new SmbFileOutputStream(url);
+            Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+            outputStream = (OutputStream) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFileOutputStream",smbFile);
             retryCount = 0;
-          } catch (jcifs.smb.SmbAuthException a) {
+          } catch (Exception a) {
             String message = a.getMessage();
             if (message.indexOf("Access is denied") >= 0) {
               // Loop and try again. JCIFS is kind of quirky
@@ -175,23 +170,23 @@ private static void setupJdbcConnection(String system, String userId, char[] enc
 
   public static void deleteFile(String system, String userId, char[] encryptedPassword, String filename)
       throws Exception {
-    SmbFile smbFile = null;
+    Object smbFile = null;
 
     system = fullyQualifySystem(system);
     String url = getUrl(system, userId, encryptedPassword, filename);
 
     if (debug)
       System.out.println("JCIFSUtility.debug:  deleteFile url=" + url);
-    smbFile = new SmbFile(url);
-    if (smbFile.exists()) {
-      smbFile.delete();
+    smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+    if (JDReflectionUtil.callMethod_B(smbFile,"exists")) {
+      JDReflectionUtil.callMethod_V(smbFile,"delete");
     }
-
+    JDReflectionUtil.callMethod_V(smbFile,"close"); 
   }
 
   public static void createDirectory(String system, String userId, char[] encryptedPassword, String directoryname)
       throws Exception {
-    SmbFile smbFile = null;
+    Object smbFile = null;
 
     system = fullyQualifySystem(system);
     String url;
@@ -204,11 +199,11 @@ public static void createDirectory(String system, String userId, char[] encrypte
       int retryCount = 20;
       while (retryCount > 0) {
         try {
-          smbFile = new SmbFile(url);
-          smbFile.mkdirs();
+          smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+          JDReflectionUtil.callMethod_V(smbFile,"mkdirs");
 
           retryCount = 0;
-        } catch (jcifs.smb.SmbAuthException a) {
+        } catch (Exception a) {
           String message = a.getMessage();
           if (message.indexOf("Access is denied") >= 0) {
             // Loop and try again. JCIFS is kind of quirky
@@ -241,7 +236,7 @@ public static void createDirectory(String system, String userId, char[] encrypte
 
   public static String[] listDirectory(String system, String userId, char[] encryptedPassword, String directoryname)
       throws Exception {
-    SmbFile smbFile = null;
+    Object smbFile = null;
 
     system = fullyQualifySystem(system);
     String url;
@@ -260,8 +255,8 @@ public static String[] listDirectory(String system, String userId, char[] encryp
       int retryCount = 20;
       while (retryCount > 0) {
         try {
-          smbFile = new SmbFile(url);
-          String[] files = smbFile.list();
+          smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+          String[] files = (String[]) JDReflectionUtil.callMethod_O(smbFile,"list");
 
           // SmbFile has a bug in that it returns the files several time.. Make
           // sure they are unique
@@ -279,7 +274,7 @@ public static String[] listDirectory(String system, String userId, char[] encryp
           }
           return files;
 
-        } catch (jcifs.smb.SmbAuthException a) {
+        } catch (Exception a) {
           String message = a.getMessage();
           if (message.indexOf("Access is denied") >= 0) {
             // Loop and try again. JCIFS is kind of quirky
@@ -310,27 +305,28 @@ public static String[] listDirectory(String system, String userId, char[] encryp
     return null;
   }
 
-  public static void recursiveDelete(SmbFile smbFile) throws Exception {
+  public static void recursiveDelete(Object smbFile) throws Exception {
     Exception savedException = null;
-    SmbFile[] files = null;
+    Object[] files;
     try {
-      files = smbFile.listFiles();
-    } catch (SmbException smbEx) {
+      files = (Object []) JDReflectionUtil.callMethod_O(smbFile,"listFiles");
+    } catch (Exception smbEx) {
       String exMessage = smbEx.toString();
       if (exMessage.indexOf("must end with") >= 0) {
-        smbFile = new SmbFile(smbFile.getURL() + "/");
-        files = smbFile.listFiles();
+        Object smbUrl = JDReflectionUtil.callMethod_O(smbFile,"getUrl");
+        smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",smbUrl + "/");
+        files = (Object []) JDReflectionUtil.callMethod_O(smbFile,"listFiles");
 
       } else {
         throw smbEx;
       }
     }
     for (int i = 0; i < files.length; i++) {
-      if (files[i].isDirectory()) {
+      if (JDReflectionUtil.callMethod_B(files[i],"isDirectory")) {
         recursiveDelete(files[i]);
       } else {
         try {
-          files[i].delete();
+          JDReflectionUtil.callMethod_V(files[i],"delete");
         } catch (Exception e) {
           savedException = e;
         }
@@ -339,7 +335,7 @@ public static void recursiveDelete(SmbFile smbFile) throws Exception {
     if (savedException != null) {
       throw savedException;
     }
-    smbFile.delete();
+    JDReflectionUtil.callMethod_V(smbFile,"delete");
   }
 
   public static boolean deleteDirectory(String system, String userId, char[] encryptedPassword, String filename)
@@ -355,21 +351,21 @@ public static boolean deleteDirectory(String system, String userId, char[] encry
       s.close();
       return true;
     } else {
-      SmbFile smbFile = null;
+      Object smbFile = null;
 
       system = fullyQualifySystem(system);
       String url = getUrl(system, userId, encryptedPassword, filename);
 
       if (debug)
         System.out.println("JCIFSUtility.debug:  deleteFile url=" + url);
-      smbFile = new SmbFile(url);
-      if (smbFile.exists()) {
-        if (smbFile.isDirectory()) {
+      smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+      if (JDReflectionUtil.callMethod_B(smbFile,"exists")) {
+        if (JDReflectionUtil.callMethod_B(smbFile,"isDirectory")) {
           recursiveDelete(smbFile);
         }
       }
-      smbFile = new SmbFile(url);
-      if (smbFile.exists()) {
+      smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+      if (JDReflectionUtil.callMethod_B(smbFile,"exists")) {
         System.out.println("Delete of " + url + " failed");
         return false;
       }
@@ -378,11 +374,16 @@ public static boolean deleteDirectory(String system, String userId, char[] encry
   }
 
   public static DataInput openDataInput(String system, String userId, char[] encryptedPassword, String filename,
-      String mode) throws Exception {
+      String mode) throws Exception  {
 
     system = fullyQualifySystem(system);
-
-    if (system.equals("localhost")) {
+    boolean isLocalhost = system.equals("localhost");
+    if (!isLocalhost) { 
+      InetAddress address = InetAddress.getByName(system);
+      InetAddress localhost = InetAddress.getLocalHost();
+      isLocalhost = address.equals(localhost); 
+    }
+    if (isLocalhost) {
       return new RandomAccessFile(filename, mode);
     } else {
       if (useJdbc) {
@@ -391,11 +392,16 @@ public static DataInput openDataInput(String system, String userId, char[] encry
         return new DataInputStream(inputStream);
       } else {
         String url = getUrl(system, userId, encryptedPassword, filename);
-        SmbFile smbFile = new SmbFile(url);
+        Object smbFile;
+        smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
 
         if (debug)
           System.out.println("JCIFSUtility.debug:  openDataInput url=" + url);
-        return new SmbRandomAccessFile(smbFile, mode);
+        try {
+          return (DataInput) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbRandomAccessFile",smbFile, mode);
+        } catch (Exception e) {
+          throw new Exception("SmbException taken",e);
+        }
       }
     }
   }
@@ -405,14 +411,14 @@ public static DataOutput openDataOutput(String system, String userId, char[] enc
 
     system = fullyQualifySystem(system);
     String url = getUrl(system, userId, encryptedPassword, filename);
-    SmbFile smbFile = new SmbFile(url);
+    Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
 
     if (debug)
       System.out.println("JCIFSUtility.debug:  openDataOutput url=" + url);
-    return new SmbRandomAccessFile(smbFile, mode);
+    return (DataOutput) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbRandomAccessFile",smbFile, mode);
   }
 
-  SmbFileOutputStream outputStream = null;
+  OutputStream outputStream = null;
   String url = null;
 
   public JCIFSUtility(String system, String userId, char[] encryptedPassword) {
@@ -428,7 +434,8 @@ public JCIFSUtility(String system, String userId, char[] encryptedPassword) {
         retry = false;
         retryCount--;
         try {
-          outputStream = new SmbFileOutputStream(url);
+          Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+          outputStream = (OutputStream) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFileOutputStream",smbFile);
         } catch (Exception e) {
           // Handle the unmapped problem (shows up as network name cannot be
           // found )
@@ -444,7 +451,8 @@ public JCIFSUtility(String system, String userId, char[] encryptedPassword) {
             netServer.createFileShare("root", "/", "ROOT", ISeriesNetServerFileShare.READ_WRITE);
             as400.close();
             // Try again to attach
-            outputStream = new SmbFileOutputStream(url);
+            Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+            outputStream = (OutputStream) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFileOutputStream",smbFile);
           } else if (message.indexOf("NTLMv2 requires extended security") >= 0) {
             if (retryCount > 0) {
               retry = true;
@@ -490,8 +498,8 @@ public void close() {
         outputStream.close();
       }
       if (url != null) {
-        SmbFile file = new SmbFile(url);
-        file.delete();
+        Object file = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url);
+        JDReflectionUtil.callMethod_V(file,"delete");
       }
     } catch (Exception e) {
       System.out.flush();
@@ -564,7 +572,7 @@ public static void main(String args[]) {
 
   public static InputStream getFileInputStream(String system, String userId, char[] encryptedPassword,
       String ifsPathName)
-      throws SmbException, MalformedURLException, UnknownHostException, FileNotFoundException, SQLException {
+      throws  Exception {
     InputStream fis = null;
 
     if (system == "localhost") {
@@ -606,8 +614,9 @@ public static InputStream getFileInputStream(String system, String userId, char[
         if (debug)
           System.out.println("JCIFSUtility.debug:  getFileInputStream url=" + url);
         try {
-          fis = new SmbFileInputStream(url);
-        } catch (SmbException e) {
+          Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+          fis = (InputStream) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFileInputStream",smbFile);
+        } catch (Exception e) {
           System.err.println("Exception on new SmbFileInputStream(" + url + ")");
           throw e;
         }
@@ -617,15 +626,16 @@ public static InputStream getFileInputStream(String system, String userId, char[
   }
 
   public static OutputStream getFileOutputStream(String system, String userId, char[] encryptedPassword,
-      String ifsPathName) throws SmbException, MalformedURLException, UnknownHostException {
+      String ifsPathName) throws Exception {
 
     OutputStream fos = null;
     String url = getUrl(system, userId, encryptedPassword, ifsPathName);
 
     if (debug)
       System.out.println("JCIFSUtility.debug:  getFileInputStream url=" + url);
+    Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
 
-    fos = new SmbFileOutputStream(url);
+    fos = (OutputStream) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFileOutputStream",smbFile);
 
     return fos;
   }
@@ -653,15 +663,17 @@ public static String getUrl(String system, String userId, char[] encryptedPasswo
 
   public static DataOutput RandomAccessFileDataOutput(String system, String userId, char[] encryptedPassword,
       String ifsPathName, String mode, int shareAccess)
-      throws SmbException, MalformedURLException, UnknownHostException {
+      throws Exception {
 
     String url = getUrl(system, userId, encryptedPassword, ifsPathName);
 
-    return new SmbRandomAccessFile(url, mode, shareAccess);
+    Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+
+    return (DataOutput) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbRandomAccessFile",smbFile, mode);
   }
 
   public static boolean fileExists(String system, String userId, char[] encryptedPassword, String filename)
-      throws MalformedURLException, SmbException, SQLException {
+      throws Exception {
 
     if (useJdbc) {
       if (jdbcConnection_ == null) {
@@ -673,35 +685,39 @@ public static boolean fileExists(String system, String userId, char[] encryptedP
       ;
       ResultSet rs = ps.executeQuery();
       if (rs.next()) {
+        rs.close(); ps.close(); 
         return true;
 
       } else {
         SQLWarning rsWarning = rs.getWarnings();
         if (rsWarning != null) {
+          rs.close(); ps.close(); 
           return false;
         }
         ;
         SQLWarning psWarning = ps.getWarnings();
         if (psWarning != null) {
+          rs.close(); ps.close(); 
           return false;
         }
         ;
 
         // File is empty
+        rs.close(); ps.close(); 
         return true;
       }
 
     } else {
       String url = getUrl(system, userId, encryptedPassword, filename);
 
-      SmbFile smbFile = new SmbFile(url);
-      return smbFile.exists();
+      Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+      return JDReflectionUtil.callMethod_B(smbFile,"exists");
 
     }
   }
 
   public static long fileLength(String system, String userId, char[] encryptedPassword, String filename)
-      throws MalformedURLException, SmbException, SQLException {
+      throws Exception {
     if (useJdbc) {
       long length = 0;
       if (jdbcConnection_ == null) {
@@ -714,22 +730,24 @@ public static long fileLength(String system, String userId, char[] encryptedPass
       if (rs.next()) {
         length = rs.getLong(1);
       } else {
+        rs.close(); 
         ps.close();
         throw new SQLException(filename + "not found");
       }
+      rs.close(); 
       ps.close();
       return length;
 
     } else {
       String url = getUrl(system, userId, encryptedPassword, filename);
 
-      SmbFile smbFile = new SmbFile(url);
-      return smbFile.length();
+      Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+      return JDReflectionUtil.callMethod_L(smbFile,"length");
     }
   }
 
   public static boolean checkExpectedRead2(String system, String userId, char[] encryptedPassword, String ifsPathName,
-      int x1, int x2) throws IOException, SQLException {
+      int x1, int x2) throws Exception {
     if (useJdbc) {
 
       if (jdbcConnection_ == null) {
@@ -743,16 +761,23 @@ public static boolean checkExpectedRead2(String system, String userId, char[] en
       if (rs.next()) {
         Blob blob = rs.getBlob(1);
         if (blob.length() < 2) {
+          rs.close(); 
+          ps.close(); 
           return false;
         } else {
           byte[] bytes = blob.getBytes(1, 2);
           if (bytes[0] == x1 && bytes[1] == x2) {
+            rs.close(); 
+            ps.close(); 
             return true;
           } else {
+            rs.close(); 
+            ps.close(); 
             return false;
           }
         }
       } else {
+        rs.close(); 
         ps.close();
         return false;
       }
@@ -761,8 +786,8 @@ public static boolean checkExpectedRead2(String system, String userId, char[] en
 
       if (debug)
         System.out.println("JCIFSUtility.debug:  checkExpectedRead2 url=" + url);
-
-      InputStream fis = new SmbFileInputStream(url);
+      Object smbFile = JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFile",url); 
+      InputStream fis = (InputStream) JDReflectionUtil.createObject(JCIFS_PACKAGE_PREFIX+"SmbFileInputStream",smbFile);
       boolean passed = fis.read() == x1 && fis.read() == x2;
       fis.close();
       return passed;
diff --git a/src/test/JDReflectionUtil.java b/src/test/JDReflectionUtil.java
index 56ebe6b8..65c32808 100644
--- a/src/test/JDReflectionUtil.java
+++ b/src/test/JDReflectionUtil.java
@@ -13,6 +13,7 @@
 
 package test;
 
+import java.io.DataInput;
 import java.io.InputStream;
 import java.io.Reader;
 import java.lang.reflect.*;
@@ -3737,6 +3738,28 @@ public static Object createObject(String classname, Object arg1) throws Exceptio
        return newObject;
                
        }
+     public static Object createObject(String classname, Object arg1, String arg2) throws Exception  {
+       Class<?> objectClass11 = classLoader_.loadClass(classname);
+       Class<?>[] twoArgTypes = new Class<?>[2];
+       twoArgTypes[0] = arg1.getClass();
+       twoArgTypes[1] = "".getClass();
+       
+       Object[] twoArgs    = new Object[2];
+       twoArgs[0] = arg1; 
+       twoArgs[1] = arg2; 
+       
+       Object newObject =null;
+       try {
+           Constructor<?> constructor = objectClass11.getDeclaredConstructor(twoArgTypes);
+
+           constructor.setAccessible(true);  
+           newObject = constructor.newInstance(twoArgs);
+       } catch (java.lang.reflect.InvocationTargetException ite) {
+           handleIte(ite);
+
+       }
+       return newObject;
+     }
 
      
  	public static Object createObject(String classname, int arg1, Object arg2) throws Exception  {
@@ -3925,6 +3948,7 @@ public static void setClassLoader(ClassLoader loader) {
     }
 
 
+
  
 
 
diff --git a/src/test/JDReport.java b/src/test/JDReport.java
index 3ccd1655..7a8b3e14 100644
--- a/src/test/JDReport.java
+++ b/src/test/JDReport.java
@@ -274,6 +274,17 @@ public static String formatLine(String next, Timestamp jarTimestamp, Connection
     String changeDateString = changeDate.toString();
     String compactDateString = changeDateString.replace(' ', 'x');
     String[] stats = getStats(htmlFile, c);
+    // 
+    // Stats are
+    //  String[0] Notatt Count 
+    //  String[1] Regressed Count 
+    //  String[2] Failed Count 
+    //  String[3] Success Count 
+    //  String[4] Regressed Testcases
+    //  String[5] Run minutes 
+    //  String[6] Failed Testcases
+    //  String[7] Scheduled Count
+
 
     long jarTime = 0;
     if (jarTimestamp != null)
@@ -311,7 +322,8 @@ public static String formatLine(String next, Timestamp jarTimestamp, Connection
     
     if ("0".equals(stats[0])) {
       returnString += "<td><a href=\"" + next + "?" + compactDateString + "\">"
-          + describeTest(next) + " Test Results</a>";
+          + describeTest(next) + " Test Results</a>"
+          + addRegressionPlusLink(next);
       if ("0".equals(stats[1])) {
         returnString += "<td>" + stats[0] + "<td><font color=\"darkgreen\"><b>"
             + stats[1] + "</b></font>" + stats[4] + "<td>" + stats[2] + stats[6]
@@ -324,7 +336,9 @@ public static String formatLine(String next, Timestamp jarTimestamp, Connection
     } else {
       returnString += "<td><a href=\"" + next + "?" + compactDateString + "\">"
           + describeTest(next)
-          + " Test Results</a><td><font color=\"red\">ERROR " + stats[0]
+          + " Test Results</a>"
+          + addRegressionPlusLink(next)
+          + "<td><font color=\"red\">ERROR " + stats[0]
           + "</font><td>" + stats[1] + stats[4] + "<td>" + stats[2] + stats[6]
           + "<td>" + stats[3] + "<td>" + stats[5] + "<td>" + schedCount;
     }
@@ -332,6 +346,19 @@ public static String formatLine(String next, Timestamp jarTimestamp, Connection
     return returnString;
   }
 
+  private static String addRegressionPlusLink(String input) {
+    
+      int htmlIndex = input.indexOf(".html");
+      if (htmlIndex > 0)
+        input = input.substring(0, htmlIndex);
+      int latestIndex = input.indexOf("latest");
+      if (latestIndex >= 0) {
+        input = input.substring(latestIndex + 6);
+      }
+
+      return " <a href=\"cgi-pase/JDRunit.acgi?PRIORITY=1&INITIALS="+input+"&TESTCASE=REGRESSIONPLUS\">RUNALL</a>"; 
+  }
+
   public static String formatHeader() {
     return "<th>Date<th>Test<th>NotAtt<th>Regressed<th>Failed<th>Success<th>RunMinutes<th>ScheduledCount";
   }
diff --git a/src/test/JDRunit.java b/src/test/JDRunit.java
index 586e9f37..99bc4a89 100644
--- a/src/test/JDRunit.java
+++ b/src/test/JDRunit.java
@@ -77,6 +77,10 @@
 @SuppressWarnings("deprecation")
 public class JDRunit {
 
+  public static String SLF4J_JAR="slf4j-api-2.0.17.jar";
+  public static String BCPROV_JAR="bcprov-jdk18on-1.84.jar"; 
+  public static String JCIFS_JAR="jcifs-3.0.2.jar"; 
+
   public static final String TMP = "/tmp";
   public static String testcaseCode = JTOpenTestEnvironment.testcaseHomeDirectory;
 
@@ -2337,9 +2341,20 @@ public JDRunitGoOutput  go() throws Exception {
         + ":/qibm/proddata/java400/ext/translator.zip:"
         + toolsJar
         + ":jars/googleauth-1.5.0.jar:jars/commons-codec-1.16.0.jar"
-        + ":jars/servlet.jar:jars/jcifs.jar:jars/fscontext.jar:jars/providerutil.jar";
-
-    
+        + ":jars/servlet.jar:jars/fscontext.jar:jars/providerutil.jar";
+
+     /* Only include JCIFS if running Java 17 or later */ 
+     char firstInitial = vmInitials.charAt(0); 
+     switch (firstInitial) {
+       case '8':
+         System.out.println("JDRunit:  Not adding JCIFS because Java 8"); 
+         break;
+       default:
+         setClasspath+=":jars/"+JCIFS_JAR+":jars/"+SLF4J_JAR+":jars/"+BCPROV_JAR;
+     }
+     
+     
+     
     /* Only add jcc jars if addJccJars is defined */
 
     if (iniProperties.getProperty("addJccJars") != null) {
@@ -2436,7 +2451,9 @@ public JDRunitGoOutput  go() throws Exception {
           System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+"fscontext.jar;" + 
           System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+"providerutil.jar;" + 
           System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+"servlet.jar;" + 
-          System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+"jcifs.jar;" + 
+          System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+JCIFS_JAR+";" + 
+          System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+SLF4J_JAR+";" + 
+          System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+BCPROV_JAR+";" +
           System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+"googleauth-1.5.0.jar;"+
           System.getProperty("user.dir") + ""+File.separator+"jars"+File.separator+"commons-codec-1.16.0.jar;" +
           jccJars + ";" +
@@ -2457,6 +2474,7 @@ public JDRunitGoOutput  go() throws Exception {
         toolsJar = javaHome + "/lib/tools.jar";
       }
 
+      
       setClasspath = "CLASSPATH=\""+testcaseCode+":" + toolboxJar + ":"
           + toolsJar + ":"  
           + System.getProperty("user.dir") + "/jars/fscontext.jar:" 
@@ -2464,7 +2482,9 @@ public JDRunitGoOutput  go() throws Exception {
           + System.getProperty("user.dir") + "/jars/servlet.jar:" 
           + System.getProperty("user.dir") + "/jars/googleauth-1.5.0.jar:"
           + System.getProperty("user.dir") + "/jars/commons-codec-1.16.0.jar:"
-          + System.getProperty("user.dir") + "/jars/jcifs.jar" + "\"";
+          + System.getProperty("user.dir") + "/jars/"+SLF4J_JAR+":"
+          + System.getProperty("user.dir") + "/jars/"+BCPROV_JAR+":"
+          + System.getProperty("user.dir") + "/jars/"+JCIFS_JAR+" " + "\"";
 
       if (System.getProperty("user.name").equalsIgnoreCase("JAVA")) {
         display = ":9";
@@ -3837,6 +3857,7 @@ private Hashtable<String, String> getReplaceStrings(String destinationDir) {
     String replaceStringsFilename = destinationDir+"/aaReplaceStrings.txt"; 
     File replaceStringsFile = new File(replaceStringsFilename);
     if (replaceStringsFile.exists()) {
+      System.out.println("Replacing using "+replaceStringsFilename); 
       try { 
       BufferedReader bufferedReader = new BufferedReader(new FileReader(replaceStringsFile)); 
       String line = bufferedReader.readLine();
@@ -4126,7 +4147,7 @@ static void checkSshSetup(String system, String pwrUsr, String pwrPass) throws E
       argTypes1[0]=authorizedKeysFile.getClass(); 
       argTypes1[1]=Boolean.TYPE;
       args1[0]=authorizedKeysFile;
-      args1[1] = new Boolean(true); 
+      args1[1] = Boolean.valueOf(true); 
       Object fileWriter = JDReflectionUtil.createObject("com.ibm.as400.access.IFSFileWriter",argTypes1,args1);
       JDReflectionUtil.callMethod_V(fileWriter,"write",rsaKey+"\n");
       JDReflectionUtil.callMethod_V(fileWriter,"close"); 
diff --git a/src/test/JDSQL400.java b/src/test/JDSQL400.java
index 7e791528..07509960 100644
--- a/src/test/JDSQL400.java
+++ b/src/test/JDSQL400.java
@@ -762,7 +762,9 @@ public static void run(String inFile, String outFile, String inUserId,
       //
 
       InputStream in = new FileInputStream(inFile);
-
+      if (debug) {
+        out.println("Setting userId="+inUserId+" in constructor"); 
+      }
       userId = inUserId;
       password = inPassword;
 
diff --git a/src/test/JTOpenTestSetup.java b/src/test/JTOpenTestSetup.java
index e7a2af4e..67804074 100644
--- a/src/test/JTOpenTestSetup.java
+++ b/src/test/JTOpenTestSetup.java
@@ -83,9 +83,9 @@ private static void checkJTOpenJars() {
         System.out.println("          Place missing files as indicated above"); 
       }
       
-      File file = new File("jars/jcifs.jar"); 
+      File file = new File("jars/jcifs-3.0.2.jar"); 
       if (!file.exists()) { 
-        System.out.println("Warning: JCIFS jar file at jars/jcifs.jar not found"); 
+        System.out.println("Warning: JCIFS jar file at jars/jcifs-3.0.2.jar  not found"); 
       }