Skip to content

Refresh local file from Jar file #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeber-ibm merged 5 commits into from
Jul 22, 2026
Merged

Refresh local file from Jar file #195

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf0e3d5
Version 1.0.10
jeber-ibm Jul 20, 2026
2ae3f9d
JDJSTPTestcase get resource from jar
jeber-ibm Jul 22, 2026
a081d37
Refresh local file from jar file
jeber-ibm Jul 22, 2026
dd5008a
Merge branch 'main' into Fixes20260513
jeber-ibm Jul 22, 2026
a628281
Remove file last modified check
jeber-ibm Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion src/test/JDJSTPTestcase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ public static void link(String javaSource, String javacOptions, int javaVersion1
// Check to see if the file needs to be recompiled
//
String sourceFile = sourcepath+"/"+javaSource;
refreshLocalFile(sourceFile);
String destFile = nativeBaseDir+"/"+sourcepath+"/"+javaSource;
String destClasses = nativeBaseDir+"/"+sourcepath+"/"+ javaSource.substring(0, javaSource.lastIndexOf(".java")) + "*.class";
String serverPf = genPfName(javaSource);
Expand Down Expand Up @@ -1343,6 +1344,7 @@ public static void link(String javaSource, String javacOptions, int javaVersion1
// Check to see if the file needs to be recompiled
//
String sourceFile = sourcepath + "/" + javaSource;
refreshLocalFile(sourceFile);
String destFile;
if (usePase) {
destFile = "/QOpenSys" + nativeBaseDir + "/" + sourcepath + "/" + javaSource;
Expand Down Expand Up @@ -1407,6 +1409,7 @@ public static void link(String javaSource, String javacOptions, int javaVersion1
// Check to see if the file needs to be recompiled
//
String sourceFile = sourcepath+"/"+javaSource;
refreshLocalFile(sourceFile);
String destFile = nativeBaseDir+"/"+sourcepath+"/"+javaSource;
if (usePase) {
destFile = "/QOpenSys/"+nativeBaseDir+"/"+sourcepath+"/"+javaSource;
Expand Down Expand Up @@ -1575,6 +1578,7 @@ public static void link(String javaSource, String javacOptions, int javaVersion1
String upperBase = base.toUpperCase();

String sourceFile = sourcepath+"/"+javaSource;
refreshLocalFile(sourceFile);
String destFile = nativeBaseDir+"/"+sourcepath+"/"+javaSource;
String serverPf = upperBase;
String command = "";
Expand Down Expand Up @@ -1645,6 +1649,7 @@ public static void link(String javaSource, String javacOptions, int javaVersion1
// load the file on the system
//
String sourceFile = sourcepath+"/"+javaSource;
refreshLocalFile(sourceFile);
String destFile = nativeBaseDir+"/"+sourcepath+"/"+javaSource;
String serverPf = upperBase;
try {
Expand Down Expand Up @@ -1679,6 +1684,8 @@ public static void crtsrvpgm(String library1, String srvpgm, String source) thro
String destFile = nativeBaseDir + "/" + sourcepath + "/" + source;
String serverPf = genPfName(source);

refreshLocalFile(sourceFile);

boolean updated = updateServerFile(sourceFile, serverPf, destFile, destFile);
if (!updated) {
if (debug)
Expand All @@ -1705,6 +1712,7 @@ public static void crtsrvpgmCPP(String library1, String srvpgm, String source) t

// transfer the file up
String sourceFile = sourcepath + "/" + source;
refreshLocalFile(sourceFile);
String destFile = nativeBaseDir + "/" + sourcepath + "/" + source;
String serverPf = genPfName(source);

Expand Down Expand Up @@ -1759,6 +1767,7 @@ public static void linkClient(String javaSource, String javacOptions) throws Exc
// Check to see if the file needs to be recompiled
//
File sourceFile = new File( sourcepath+"/"+javaSource);
refreshLocalFile( sourcepath+"/"+javaSource);
File newSourceFile = new File (javaRunPath+"/"+javaSource);
File destFile = new File( javaRunPath+"/"+classFilename);
if (destFile.exists()) {
Expand Down Expand Up @@ -1905,6 +1914,7 @@ public static void linkClient(String javaSource, String javacOptions) throws Exc
rs.close();

File sourceFile = new File( sourcepath+"/"+javaSource);
refreshLocalFile(sourcepath+"/"+javaSource);
File newSourceFile = new File (javaRunPath+"/"+javaSource);
File destFile = new File( javaRunPath+"/"+classFilename);
if (destFile.exists()) {
Expand Down Expand Up @@ -2106,6 +2116,7 @@ public static void linkSqlj(String sqljSource) throws Exception {
//
String base = sqljSource.substring(0, sqljSource.lastIndexOf(".sqlj"));
String sourceFile = sourcepath+"/"+sqljSource;
refreshLocalFile(sourceFile);
String serverFile = nativeBaseDir+"/"+base+".sqlj";
String destFile = nativeBaseDir+"/"+base+".class";
String javaFile = nativeBaseDir+"/"+base+".java";
Expand Down Expand Up @@ -2633,6 +2644,44 @@ public boolean updateBinaryServerFile(String localFile, String serverFile) thro

}

public static void refreshLocalFile(String localFile) throws Exception {
//
// Determine if the local file needs to be extracted from the classpath
//
// Get the URL of the resource inside the JAR file
URL url = JDJSTPTestcase.class.getResource(localFile);
File file = new File(localFile);
long currentTime = file.lastModified();
long lastJarModifiedMs = 0;
if (url != null) {
// If url indicates a jar file, when we will copy to local filesystem
if (url.getProtocol().equals("jar")) {
URLConnection connection = url.openConnection();
lastJarModifiedMs = connection.getLastModified();
}
} else {
System.out.println("Resource not found.");
}
if (lastJarModifiedMs > currentTime) {
int lastSlashIndex = localFile.lastIndexOf('/');
if (lastSlashIndex > 0) {
String directory = localFile.substring(0,lastSlashIndex);
File directoryFile = new File(directory);
if (!directoryFile.exists()) {
directoryFile.mkdirs();
}
}

InputStream is = url.openStream();
FileSystem fsDefault = FileSystems.getDefault();
Files.copy(is, fsDefault.getPath(localFile), StandardCopyOption.REPLACE_EXISTING);
fsDefault.close();
is.close();
currentTime = file.lastModified();
}


}

/**
* Assures that a file on the server is up to date.
Expand Down Expand Up @@ -2683,7 +2732,6 @@ public static boolean updateServerFile(String localFile, String serverPf, String
//
// Determine if server file needs to be updated
//

if (currentTime == 0L) {
throw new Exception("File "+localFile+" not found");
}
Expand Down Expand Up @@ -6289,9 +6337,11 @@ public static void RasUser(String testpgm, String userId, char[] encryptedPasswo
//
if (testext.equals("clp")) {
command = sourcepath+"/"+testpgm;
refreshLocalFile(command);
JDSQL400.run(command, output, userId, PasswordVault.decryptPasswordLeak(encryptedPassword, "JDJSTPTestcase.rau.1") );
} else if (testext.equals("jdbc")) {
command = sourcepath+"/"+testpgm;
refreshLocalFile(command);
runJdbcClient(command, output, userId, encryptedPassword);
} else {
throw new Exception("Cannot run test "+testpgm+". Extension "+testext+" not recognized");
Expand Down
Loading