Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
This commit is contained in:
commit
4bf80d9653
|
@ -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.
|
||||
|
|
|
@ -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());
|
||||
|
||||
|
|
Loading…
Reference in New Issue