Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

jetty · Apr 28, 2020 · 4bf80d9 · 4bf80d9
2 parents ef4d1fa + e2af641
commit 4bf80d9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/...sgi-boot/jettyhome/etc/jetty-deployer.xml → ...-osgi-boot/jettyhome/etc/jetty-deploy.xml b/...sgi-boot/jettyhome/etc/jetty-deployer.xml → ...-osgi-boot/jettyhome/etc/jetty-deploy.xml
diff --git a/...ava/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/...ava/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
@@ -64,7 +64,7 @@ public class DefaultJettyAtJettyHomeHelper
     /**
      * Set of config files to apply to a jetty Server instance if none are supplied by SYS_PROP_JETTY_ETC_FILES
      */
-    public static final String DEFAULT_JETTY_ETC_FILES = "etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deployer.xml";
+    public static final String DEFAULT_JETTY_ETC_FILES = "etc/jetty.xml,etc/jetty-http.xml,etc/jetty-deploy.xml";
 
     /**
      * Default location within bundle of a jetty home dir.

diff --git a/...gi/src/test/config/etc/jetty-deployer.xml → ...osgi/src/test/config/etc/jetty-deploy.xml b/...gi/src/test/config/etc/jetty-deployer.xml → ...osgi/src/test/config/etc/jetty-deploy.xml
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -104,7 +104,7 @@ public static List<Option> configureJettyHomeAndPort(boolean ssl, String jettySe
         }
         xmlConfigs.append(new File(etc, jettySelectorFileName).toURI());
         xmlConfigs.append(";");
-        xmlConfigs.append(new File(etc, "jetty-deployer.xml").toURI());
+        xmlConfigs.append(new File(etc, "jetty-deploy.xml").toURI());
         xmlConfigs.append(";");
         xmlConfigs.append(new File(etc, "jetty-testrealm.xml").toURI());