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

323985 Xmlconfiguration pulls start.jar config properties 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2326 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-10-06 23:43:14 +00:00
parent e6c74c4294
commit 0e6f62664d
4 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,6 +1,7 @@
jetty-7.2.0.RC1-SNAPSHOT
+ 289540 added javadoc into distribution
+ 297154 add source distribution artifact
+ 323985 Xmlconfiguration pulls start.jar config properties
+ 326734 Configure Digest maxNonceAge with Security handler init param
jetty-7.2.0.RC0 1 Oct 2010

44
jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
View File

@ -138,6 +138,10 @@ import java.util.TreeSet;
* <p>
* The tag '*' is always appended to the options, so any section with the * tag is always applied.
* </p>
*
* <p>
* The property map maintained by this class is static and shared between all instances in the same classloader
* </p>
*/
public class Config
{
@ -168,10 +172,14 @@ public class Config
private static final String _version;
private static boolean DEBUG = false;
private static final Map<String, String> __properties = new HashMap<String, String>();
private final Map<String, Classpath> _classpaths = new HashMap<String, Classpath>();
private final List<String> _xml = new ArrayList<String>();
private final Set<String> _policies = new HashSet<String>();
private String _classname = null;
private int argCount = 0;
private final Set<String> _activeOptions = new TreeSet<String>(new Comparator<String>()
{
// Make sure "*" is always at the end of the list
@ -188,8 +196,6 @@ public class Config
return o1.compareTo(o2);
}
});
private final Map<String, String> _properties = new HashMap<String, String>();
private int argCount = 0;
private boolean addClasspathComponent(List<String> sections, String component)
{
@ -404,23 +410,31 @@ public class Config
return _classname;
}
public Map<String,String> getProperties()
public static void clearProperties()
{
return Collections.unmodifiableMap(_properties);
__properties.clear();
}
public String getProperty(String name)
public static Properties getProperties()
{
Properties properties = new Properties();
for (String key : __properties.keySet())
properties.put(key,__properties.get(key));
return properties;
}
public static String getProperty(String name)
{
if ("version".equalsIgnoreCase(name))
return _version;
return _properties.get(name);
return __properties.get(name);
}
public String getProperty(String name, String dftValue)
public static String getProperty(String name, String dftValue)
{
if (_properties.containsKey(name))
return _properties.get(name);
if (__properties.containsKey(name))
return __properties.get(name);
return dftValue;
}
@ -451,8 +465,8 @@ public class Config
{
if ("version".equalsIgnoreCase(name))
return _version;
if (_properties.containsKey(name))
return _properties.get(name);
if (__properties.containsKey(name))
return __properties.get(name);
return System.getProperty(name);
}
@ -945,7 +959,7 @@ public class Config
addActiveOption(id);
}
}
_properties.put(name,value);
__properties.put(name,value);
}
public Policy getPolicyInstance(ClassLoader cl) throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException,
@ -954,7 +968,7 @@ public class Config
Class<?> jettyPolicy = cl.loadClass("org.eclipse.jetty.policy.JettyPolicy");
Constructor<?> c = jettyPolicy.getConstructor(new Class[]
{ Set.class, Map.class });
Object policyClass = c.newInstance(_policies,_properties);
Object policyClass = c.newInstance(_policies,__properties);
if (policyClass instanceof Policy)
{
@ -969,7 +983,7 @@ public class Config
public void addActiveOption(String option)
{
_activeOptions.add(option);
_properties.put("OPTIONS",join(_activeOptions,","));
__properties.put("OPTIONS",join(_activeOptions,","));
}
public Set<String> getActiveOptions()
@ -980,7 +994,7 @@ public class Config
public void removeActiveOption(String option)
{
_activeOptions.remove(option);
_properties.put("OPTIONS",join(_activeOptions,","));
__properties.put("OPTIONS",join(_activeOptions,","));
}
private String join(Collection<?> coll, String delim)

7
jetty-start/src/test/java/org/eclipse/jetty/start/ConfigTest.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import java.util.Set;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class ConfigTest
@ -93,6 +94,12 @@ public class ConfigTest
File test = new File(src,"test");
return new File(test,"resources");
}
@Before
public void reset()
{
Config.clearProperties();
}
/*
* Test for SUBJECT "/=" for assign canonical path

30
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
View File

@ -987,7 +987,34 @@ public class XmlConfiguration
try
{
Properties properties = new Properties();
Properties properties=null;
// Look for properties from start.jar
try
{
Class<?> config = XmlConfiguration.class.getClassLoader().loadClass("org.eclipse.jetty.start.Config");
properties=(Properties)config.getMethod("getProperties").invoke(null);
Log.debug("org.eclipse.jetty.start.Config properties = {}",properties);
}
catch(NoClassDefFoundError e)
{
Log.ignore(e);
}
catch(ClassNotFoundException e)
{
Log.ignore(e);
}
catch(Exception e)
{
Log.warn(e);
}
// If no start.config properties, use clean slate
if (properties==null)
properties = new Properties();
// For all arguments, load properties or parse XMLs
XmlConfiguration last = null;
Object[] obj = new Object[args.length];
for ( int i = 0; i < args.length; i++ )
@ -1009,6 +1036,7 @@ public class XmlConfiguration
}
}
// For all objects created by XmlConfigurations, start them if they are lifecycles.
for ( int i = 0; i < args.length; i++ )
{
if ( obj[i] instanceof LifeCycle )