Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-06-19 05:27:47 +0000
committerGreg Wilkins2015-06-19 05:27:47 +0000
commit13b63c194b010201c439932ece2f1bc628ebf287 (patch)
tree771c4ae21b48e80864d4e5d4bf0f794aa488c6b6 /jetty-xml
parentb0a3c7c5eafc472d685f86178ca04b173616215e (diff)
downloadorg.eclipse.jetty.project-13b63c194b010201c439932ece2f1bc628ebf287.tar.gz
org.eclipse.jetty.project-13b63c194b010201c439932ece2f1bc628ebf287.tar.xz
org.eclipse.jetty.project-13b63c194b010201c439932ece2f1bc628ebf287.zip
Default values for properties in ini files
While this feature is not strictly needed, the patch contains some good code cleanups. So it will be applied and then the default feature removed in a subsequent commit.
Diffstat (limited to 'jetty-xml')
-rw-r--r--jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
index ba8ec5e6c0..2cc4222ce3 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -46,7 +46,6 @@ import java.util.Queue;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Pattern;
import org.eclipse.jetty.util.ArrayQueue;
import org.eclipse.jetty.util.LazyList;
@@ -86,7 +85,6 @@ public class XmlConfiguration
{Boolean.class, Character.class, Byte.class, Short.class, Integer.class, Long.class, Float.class, Double.class, Void.class};
private static final Class<?>[] __supportedCollections =
{ArrayList.class, ArrayQueue.class, HashSet.class, Queue.class, List.class, Set.class, Collection.class};
- private static final Pattern __propertyPattern = Pattern.compile("\\$\\{([^\\}]+)\\}");
private static final Iterable<ConfigurationProcessorFactory> __factoryLoader = ServiceLoader.load(ConfigurationProcessorFactory.class);
private static final XmlParser __parser = initParser();
private static XmlParser initParser()
@@ -1305,17 +1303,11 @@ public class XmlConfiguration
return StringUtil.valueOf(get(elementName,false));
}
- public Object get(String elementName) throws Exception
- {
- return get(elementName,false);
- }
-
public String getString(String elementName, boolean manditory) throws Exception
{
return StringUtil.valueOf(get(elementName,manditory));
}
-
public Object get(String elementName, boolean manditory) throws Exception
{
String attrName=StringUtil.asciiToLowerCase(elementName);
@@ -1493,7 +1485,7 @@ public class XmlConfiguration
{
if (!args[i].toLowerCase(Locale.ENGLISH).endsWith(".properties") && (args[i].indexOf('=')<0))
{
- XmlConfiguration configuration = new XmlConfiguration(Resource.newResource(args[i]).getURL());
+ XmlConfiguration configuration = new XmlConfiguration(Resource.newResource(args[i]).getURI().toURL());
if (last != null)
configuration.getIdMap().putAll(last.getIdMap());
if (properties.size() > 0)

Back to the top