From 0cd8d21bfd54176c091267bfd7ac1165354b10f8 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 15 Feb 2017 11:34:47 -0700
Subject: [PATCH] Issue #1331 - replacing with ${jetty.base.uri} form

---
 .../src/main/config-template/modules/gcloud.mod               | 2 +-
 jetty-util/src/main/config/modules/logging-jul.mod            | 2 +-
 jetty-util/src/main/config/modules/logging-log4j.mod          | 2 +-
 jetty-util/src/main/config/modules/logging-log4j2.mod         | 2 +-
 jetty-util/src/main/config/modules/logging-logback.mod        | 2 +-
 jetty-util/src/main/config/modules/logging-slf4j.mod          | 2 +-
 jetty-webapp/src/main/config/modules/webapp.mod               | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
index 71ab903803e..2716e27fb22 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
@@ -15,4 +15,4 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini-template]
 ## Hide the gcloud libraries from deployed webapps
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/gcloud/
+jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/gcloud/
diff --git a/jetty-util/src/main/config/modules/logging-jul.mod b/jetty-util/src/main/config/modules/logging-jul.mod
index 4a16acdeb41..17391fd1a02 100644
--- a/jetty-util/src/main/config/modules/logging-jul.mod
+++ b/jetty-util/src/main/config/modules/logging-jul.mod
@@ -16,4 +16,4 @@ logging
 -Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/
+jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/
diff --git a/jetty-util/src/main/config/modules/logging-log4j.mod b/jetty-util/src/main/config/modules/logging-log4j.mod
index 4d5ee4ef692..55d68bc2243 100644
--- a/jetty-util/src/main/config/modules/logging-log4j.mod
+++ b/jetty-util/src/main/config/modules/logging-log4j.mod
@@ -16,4 +16,4 @@ logging
 -Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/log4j/
+jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/,${jetty.base.uri}/lib/log4j/
diff --git a/jetty-util/src/main/config/modules/logging-log4j2.mod b/jetty-util/src/main/config/modules/logging-log4j2.mod
index 17cf3310462..5c68f013479 100644
--- a/jetty-util/src/main/config/modules/logging-log4j2.mod
+++ b/jetty-util/src/main/config/modules/logging-log4j2.mod
@@ -16,4 +16,4 @@ logging
 -Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/log4j2/
+jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/,${jetty.base.uri}/lib/log4j2/
diff --git a/jetty-util/src/main/config/modules/logging-logback.mod b/jetty-util/src/main/config/modules/logging-logback.mod
index ccc1aea998b..6fc453669ef 100644
--- a/jetty-util/src/main/config/modules/logging-logback.mod
+++ b/jetty-util/src/main/config/modules/logging-logback.mod
@@ -16,4 +16,4 @@ logging
 -Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/,file:${jetty.base}/lib/logback/
+jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/,${jetty.base.uri}/lib/logback/
diff --git a/jetty-util/src/main/config/modules/logging-slf4j.mod b/jetty-util/src/main/config/modules/logging-slf4j.mod
index fb26486e9da..5dde76f6e37 100644
--- a/jetty-util/src/main/config/modules/logging-slf4j.mod
+++ b/jetty-util/src/main/config/modules/logging-slf4j.mod
@@ -16,4 +16,4 @@ logging
 -Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog
 
 [ini]
-jetty.webapp.addServerClasses+=,file:${jetty.base}/lib/slf4j/
+jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
index 22d5ed8d5b2..59f067f8118 100644
--- a/jetty-webapp/src/main/config/modules/webapp.mod
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -20,8 +20,8 @@ lib/jetty-webapp-${jetty.version}.jar
 ## Lists of patterns are comma separated and may be either:
 ##  + a qualified classname e.g. 'com.acme.Foo' 
 ##  + a package name e.g. 'net.example.'
-##  + a jar file e.g. 'file:${jetty.base}/lib/dependency.jar' 
-##  + a directory of jars,resource or classes e.g. 'file:${jetty.base}/resources' 
+##  + a jar file e.g. '${jetty.base.uri}/lib/dependency.jar' 
+##  + a directory of jars,resource or classes e.g. '${jetty.base.uri}/resources' 
 ##  + A pattern preceeded with a '-' is an exclusion, all other patterns are inclusions
 ##
 ## The +=, operator appends to a CSV list with a comma as needed.