379015 Use factored jetty xml config files for defaults

7 files changed, 6 insertions, 5 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);
diff --git a/jetty-osgi/jetty-osgi-servletbridge/pom.xml b/jetty-osgi/jetty-osgi-servletbridge/pom.xml
index afcd97e9bf..b2808f40d8 100644
--- a/jetty-osgi/jetty-osgi-servletbridge/pom.xml
+++ b/jetty-osgi/jetty-osgi-servletbridge/pom.xml
@@ -21,6 +21,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java b/jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
index e880b3f0f9..24c7bb72dc 100644
--- a/jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
+++ b/jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
@@ -292,9 +292,9 @@ public class FrameworkLauncherExtended extends FrameworkLauncher
             if (etcJettyXml == null)
             {
                 etcJettyXml = "etc/jetty.xml";
-                if (new File(jettyHome, "etc/jetty-osgi-nested.xml").exists())
+                if (new File(jettyHome, "etc/jetty-nested.xml").exists())
                 {
-                    etcJettyXml += ",etc/jetty-osgi-nested.xml";
+                    etcJettyXml += ",etc/jetty-nested.xml";
                 }
                 System.setProperty("jetty.etc.config.urls", etcJettyXml);
                 props.setProperty("jetty.etc.config.urls", etcJettyXml);