diff options
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot')
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml (renamed from jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-deployer-default.xml) | 0 | ||||
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml (renamed from jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-nested-default.xml) | 0 | ||||
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml (renamed from jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-selector-default.xml) | 0 | ||||
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml (renamed from jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml) | 0 | ||||
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java | 6 |
5 files changed, 3 insertions, 3 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-deployer-default.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml index f05b31c8e1..f05b31c8e1 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-deployer-default.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-nested-default.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml index c11cec1192..c11cec1192 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-nested-default.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-nested.xml diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-selector-default.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml index 46ccc85f52..46ccc85f52 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-selector-default.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index 30f8ea9d18..30f8ea9d18 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-osgi-default.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java index 2503c9de8d..a9d2ce5966 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java @@ -81,7 +81,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 = "jetty-osgi-default.xml,jetty-osgi-selector-default.xml,jetty-osgi-deployer-default.xml"; + public static final String DEFAULT_JETTY_ETC_FILES = "jetty.xml,jetty-selector.xml,jetty-deployer.xml"; /** * Default location within bundle of a jetty home dir. @@ -227,7 +227,7 @@ public class DefaultJettyAtJettyHomeHelper private static String getJettyConfigurationURLs(Bundle configurationBundle) { String files = System.getProperty(SYS_PROP_JETTY_ETC_FILES, DEFAULT_JETTY_ETC_FILES); - + StringTokenizer tokenizer = new StringTokenizer(files, ";,", false); StringBuilder res = new StringBuilder(); @@ -248,7 +248,7 @@ public class DefaultJettyAtJettyHomeHelper // jettyhome for the default embedded configuration. // default inside jettyhome. this way fragments to the bundle // can define their own configuration. - if ((enUrls == null || !enUrls.hasMoreElements()) && etcFile.endsWith("-default.xml")) + if ((enUrls == null || !enUrls.hasMoreElements())) { String tmp = DEFAULT_JETTYHOME+"/etc/"+etcFile; enUrls = BundleFileLocatorHelper.DEFAULT.findEntries(configurationBundle, tmp); |