rife2/bld-spring-boot
rife2/bld-spring-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaned up logging

Browse source
This commit is contained in:
Erik C. Thauvin 2023-10-30 16:53:11 -07:00
parent ed86a98335
commit 58a2245840
6 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/rife/bld/extension/AbstractBootOperation.java
View file

@ -174,8 +174,9 @@ public abstract class AbstractBootOperation<T extends AbstractBootOperation<T>>
* Part of the {@link #execute} operation, create the archive from the staging directory.
*
* @param stagingDirectory the staging directory
* @return the archive
*/
protected void executeCreateArchive(File stagingDirectory)
protected File executeCreateArchive(File stagingDirectory)
throws IOException {
executeCreateManifest(stagingDirectory);
if (LOGGER.isLoggable(Level.FINE) && (!silent())) {
@ -199,9 +200,9 @@ public abstract class AbstractBootOperation<T extends AbstractBootOperation<T>>
args = "-0cMf";
}
jarTool.run(stdout, stderr, args,
new File(destinationDirectory(), destinationFileName()).getAbsolutePath(),
"-C", stagingDirectory.getAbsolutePath(), ".");
var archive = new File(destinationDirectory(), destinationFileName());
jarTool.run(stdout, stderr, args, archive.getAbsolutePath(), "-C", stagingDirectory.getAbsolutePath(), ".");
var errBuff = err.getBuffer();
if (!errBuff.isEmpty()) {
@ -212,6 +213,8 @@ public abstract class AbstractBootOperation<T extends AbstractBootOperation<T>>
LOGGER.info(outBuff.toString());
}
}
return archive;
}
/**

5
src/main/java/rife/bld/extension/BootJarOperation.java
View file

@ -50,11 +50,10 @@ public class BootJarOperation extends AbstractBootOperation<BootJarOperation> {
executeCopyInfLibs(boot_inf_dir);
executeCopyBootLoader(staging_dir);
executeCreateArchive(staging_dir);
var archive = executeCreateArchive(staging_dir);
if (!silent() && LOGGER.isLoggable(Level.INFO)) {
LOGGER.info(String.format("The executable JAR (%s) was created in: %s%n", destinationFileName(),
destinationDirectory()));
LOGGER.info("The executable JAR was created: " + archive.getAbsolutePath());
}
} finally {
FileUtils.deleteDirectory(staging_dir);

5
src/main/java/rife/bld/extension/BootWarOperation.java
View file

@ -54,11 +54,10 @@ public class BootWarOperation extends AbstractBootOperation<BootWarOperation> {
executeCopyWebInfProvidedLib(web_inf_dir);
executeCopyBootLoader(staging_dir);
executeCreateArchive(staging_dir);
var archive = executeCreateArchive(staging_dir);
if (!silent() && LOGGER.isLoggable(Level.INFO)) {
LOGGER.info(String.format("The executable WAR (%s) was created in: %s%n", destinationFileName(),
destinationDirectory()));
LOGGER.info("The executable WAR was created: " + archive.getAbsolutePath());
}
} finally {
FileUtils.deleteDirectory(staging_dir);