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 2020/03/03 12:57:42 UTC
[karaf] branch karaf-4.2.x updated (a321e70 -> fe9378e)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from a321e70 Fix invalid URL to Karaf Dev mailing list
new bc51711 Fix: Support whitespaces within karaf path on windows
new fe9378e Add missing java.net.URISyntaxException
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/karaf/shell/impl/console/standalone/Main.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
[karaf] 02/02: Add missing java.net.URISyntaxException
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit fe9378e6f1bab1852589f7be4c297d0e4bfa1f1f
Author: Christian Lutz <ch...@inovel.de>
AuthorDate: Mon Mar 2 16:47:43 2020 +0100
Add missing java.net.URISyntaxException
(cherry picked from commit 5433376e1ebe3c774a2133190fb62d0ff8d9ce06)
---
.../main/java/org/apache/karaf/shell/impl/console/standalone/Main.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
index 5cc3dd4..ead34fb 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
@@ -27,6 +27,7 @@ import java.io.InputStreamReader;
import java.io.PrintStream;
import java.io.Reader;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -148,7 +149,7 @@ public class Main {
run(sessionFactory, sb.toString(), in, out, err, cl);
}
- private List<URL> getJarsInJars(List<URL> urls) throws IOException {
+ private List<URL> getJarsInJars(List<URL> urls) throws IOException, URISyntaxException {
List<URL> result = new ArrayList<>();
for (URL url : urls) {
try (JarFile jarFile = new JarFile(url.toURI().getPath())) {
[karaf] 01/02: Fix: Support whitespaces within karaf path on windows
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit bc517116ba95f8636c5ac3abaa9315e0a1bbc698
Author: Christian Lutz <ch...@inovel.de>
AuthorDate: Mon Mar 2 16:29:36 2020 +0100
Fix: Support whitespaces within karaf path on windows
(cherry picked from commit a8b9ddff5c5af048c29171416cc12e3f5f481cc9)
---
.../main/java/org/apache/karaf/shell/impl/console/standalone/Main.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
index 631e5a8..5cc3dd4 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
@@ -151,7 +151,7 @@ public class Main {
private List<URL> getJarsInJars(List<URL> urls) throws IOException {
List<URL> result = new ArrayList<>();
for (URL url : urls) {
- try (JarFile jarFile = new JarFile(url.getFile())) {
+ try (JarFile jarFile = new JarFile(url.toURI().getPath())) {
Manifest manifest = jarFile.getManifest();
String embeddedArtifacts = manifest.getMainAttributes().getValue(JarInJarConstants.REDIRECTED_CLASS_PATH_MANIFEST_NAME);
if (embeddedArtifacts != null) {