From 46f7ec33b83c28459496739f4d8b91329fb82bc6 Mon Sep 17 00:00:00 2001

From: Michael Simacek <msimacek@redhat.com>

Date: Tue, 2 Jun 2015 22:52:21 +0200

Subject: [PATCH 1/2] Fedora jetty.home

---

 .../eclipse/jetty/start/config/CommandLineConfigSource.java    | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java

index f0c9e07..7d2ee3e 100644

--- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java

+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java

@@ -120,6 +120,9 @@ public class CommandLineConfigSource implements ConfigSource

                 try

                 {

                     Path home = new File(new URI(m.group(1))).getParentFile().toPath();

+                    if (home.endsWith("/usr/share/java/jetty"))

+                        home = new File(home.toString().replaceAll("java/jetty$", "jetty")).toPath();

+

                     setProperty(BaseHome.JETTY_HOME,home.toString(),ORIGIN_INTERNAL_FALLBACK);

                     return home;

                 }

-- 

2.19.1