You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/11/23 12:18:32 UTC
[karaf-minho] branch main updated: Be able to load banner.txt from classloader
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-minho.git
The following commit(s) were added to refs/heads/main by this push:
new a6fd883 Be able to load banner.txt from classloader
a6fd883 is described below
commit a6fd883770739287bf7a3e01f7ecdc707eede71a
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Nov 23 13:18:15 2022 +0100
Be able to load banner.txt from classloader
---
.../karaf/minho/banner/WelcomeBannerService.java | 33 +++++++++++++++-------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/services/minho-banner/src/main/java/org/apache/karaf/minho/banner/WelcomeBannerService.java b/services/minho-banner/src/main/java/org/apache/karaf/minho/banner/WelcomeBannerService.java
index ce16f67..dbe4f18 100644
--- a/services/minho-banner/src/main/java/org/apache/karaf/minho/banner/WelcomeBannerService.java
+++ b/services/minho-banner/src/main/java/org/apache/karaf/minho/banner/WelcomeBannerService.java
@@ -22,9 +22,7 @@ import org.apache.karaf.minho.boot.service.ConfigService;
import org.apache.karaf.minho.boot.service.ServiceRegistry;
import org.apache.karaf.minho.boot.spi.Service;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
+import java.io.*;
@Log
public class WelcomeBannerService implements Service {
@@ -61,13 +59,17 @@ public class WelcomeBannerService implements Service {
File file = new File("banner.txt");
if (file.exists()) {
- try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
- String line;
- StringBuilder builder = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- builder.append(line).append("\n");
- }
- log.info("\n" + builder.toString());
+ try {
+ log.info("\n" + readBanner(new FileReader(file)));
+ } catch (Exception e) {
+ // no-op
+ }
+ return;
+ }
+
+ if (WelcomeBannerService.class.getResourceAsStream("/banner.txt") != null) {
+ try {
+ log.info("\n" + readBanner(new InputStreamReader(WelcomeBannerService.class.getResourceAsStream("/banner.txt"))));
} catch (Exception e) {
// no-op
}
@@ -84,4 +86,15 @@ public class WelcomeBannerService implements Service {
" Apache Karaf Minho 1.x\n");
}
+ private String readBanner(Reader reader) throws IOException {
+ try (BufferedReader bufferedReader = new BufferedReader(reader)) {
+ String line;
+ StringBuilder builder = new StringBuilder();
+ while ((line = bufferedReader.readLine()) != null) {
+ builder.append(line).append("\n");
+ }
+ return builder.toString();
+ }
+ }
+
}