echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow overriding the env props

Browse Source
This commit is contained in:
jrandom
2004-04-24 22:29:01 +00:00
committed by zzz
parent e73eb55d75
commit d659447879
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/src/net/i2p/I2PAppContext.java
View File

@ -58,6 +58,8 @@ public class I2PAppContext {
*/ */
protected static volatile boolean _globalAppContextInitialized; protected static volatile boolean _globalAppContextInitialized;
private Properties _overrideProps;
private StatManager _statManager; private StatManager _statManager;
private SessionKeyManager _sessionKeyManager; private SessionKeyManager _sessionKeyManager;
private NamingService _namingService; private NamingService _namingService;
@ -97,7 +99,7 @@ public class I2PAppContext {
synchronized (I2PAppContext.class) { synchronized (I2PAppContext.class) {
System.err.println("*** Building seperate global context!"); System.err.println("*** Building seperate global context!");
if (_globalAppContext == null) if (_globalAppContext == null)
_globalAppContext = new I2PAppContext(false); _globalAppContext = new I2PAppContext(false, null);
_globalAppContextInitialized = true; _globalAppContextInitialized = true;
} }
} }
@ -109,12 +111,19 @@ public class I2PAppContext {
* *
*/ */
public I2PAppContext() { public I2PAppContext() {
this(true); this(true, null);
}
/**
* Lets root a brand new context
*
*/
public I2PAppContext(Properties envProps) {
this(true, envProps);
} }
/** /**
* @param doInit should this context be used as the global one (if necessary)? * @param doInit should this context be used as the global one (if necessary)?
*/ */
private I2PAppContext(boolean doInit) { private I2PAppContext(boolean doInit, Properties envProps) {
//System.out.println("App context created: " + this); //System.out.println("App context created: " + this);
if (doInit) { if (doInit) {
if (!_globalAppContextInitialized) { if (!_globalAppContextInitialized) {
@ -126,6 +135,7 @@ public class I2PAppContext {
} }
} }
} }
_overrideProps = envProps;
_statManager = null; _statManager = null;
_sessionKeyManager = null; _sessionKeyManager = null;
_namingService = null; _namingService = null;
@ -141,32 +151,46 @@ public class I2PAppContext {
} }
/** /**
* Access the configuration attributes of this context (aka System.getProperty) * Access the configuration attributes of this context, using properties
* This can be overloaded by subclasses to allow different system * provided during the context construction, or falling back on
* properties for different app contexts. * System.getProperty if no properties were provided during construction
* (or the specified prop wasn't included).
* *
*/ */
public String getProperty(String propName) { public String getProperty(String propName) {
if (_overrideProps != null) {
if (_overrideProps.containsKey(propName))
return _overrideProps.getProperty(propName);
}
return System.getProperty(propName); return System.getProperty(propName);
} }
/** /**
* Access the configuration attributes of this context (aka System.getProperty) * Access the configuration attributes of this context, using properties
* This can be overloaded by subclasses to allow different system * provided during the context construction, or falling back on
* properties for different app contexts. * System.getProperty if no properties were provided during construction
* (or the specified prop wasn't included).
* *
*/ */
public String getProperty(String propName, String defaultValue) { public String getProperty(String propName, String defaultValue) {
if (_overrideProps != null) {
if (_overrideProps.containsKey(propName))
return _overrideProps.getProperty(propName, defaultValue);
}
return System.getProperty(propName, defaultValue); return System.getProperty(propName, defaultValue);
} }
/** /**
* Access the configuration attributes of this context (aka System.getProperties) * Access the configuration attributes of this context, listing the properties
* This can be overloaded by subclasses to allow different system * provided during the context construction, as well as the ones included in
* properties for different app contexts. * System.getProperties.
* *
* @return set of Strings containing the names of defined system properties * @return set of Strings containing the names of defined system properties
*/ */
public Set getPropertyNames() { public Set getPropertyNames() {
return new HashSet(System.getProperties().keySet()); Set names = new HashSet(System.getProperties().keySet());
if (_overrideProps != null)
names.addAll(_overrideProps.keySet());
return names;
} }
/** /**