Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jan Bartel 2020-04-28 11:40:20 +02:00
parent ef4d1fac04 e2af6419ae
commit 4bf80d9653
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml → jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deploy.xml
View File

2
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
View File

@ -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.

0
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml → jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml
View File

2
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
View File

@ -104,7 +104,7 @@ public class TestOSGiUtil
}
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());