mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-06 00:25:58 +00:00
Allow setting of system properties from context.xml in addition to setting from command-line.
Accomplished by centralizing calls to System.getProperty(String) and related into new file SystemProperties.java. There, we first check for existence of system property; if not, we look for property in context.xml This is done for "application" properties (like hudson.DNSMultiCast.disabled) but not for java properties (like user.name)
This commit is contained in:
1 parent
b23b3cfae4
commit
709fe5b9aa
61 files changed
+358
-90
No files matched your search
@@ -561,7 +561,7 @@ public class Functions {
|
||||
/**
|
||||
* Set to true if you need to use the debug version of YUI.
|
||||
*/
|
||||
public static boolean DEBUG_YUI = Boolean.getBoolean("debug.YUI");
|
||||
public static boolean DEBUG_YUI = SystemProperties.getBoolean("debug.YUI");
|
||||
|
||||
/**
|
||||
* Creates a sub map by using the given range (both ends inclusive).
|
||||
@@ -616,7 +616,7 @@ public class Functions {
|
||||
response.addCookie(c);
|
||||
}
|
||||
if (refresh) {
|
||||
response.addHeader("Refresh", System.getProperty("hudson.Functions.autoRefreshSeconds", "10"));
|
||||
response.addHeader("Refresh", SystemProperties.getProperty("hudson.Functions.autoRefreshSeconds", "10"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -838,7 +838,7 @@ public class Functions {
|
||||
*/
|
||||
public static String getFooterURL() {
|
||||
if(footerURL == null) {
|
||||
footerURL = System.getProperty("hudson.footerURL");
|
||||
footerURL = SystemProperties.getProperty("hudson.footerURL");
|
||||
if(StringUtils.isBlank(footerURL)) {
|
||||
footerURL = "http://jenkins-ci.org/";
|
||||
}
|
||||
@@ -1567,10 +1567,6 @@ public class Functions {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
public String getSystemProperty(String key) {
|
||||
return System.getProperty(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the host name of the Hudson server that clients can use to talk back to.
|
||||
* <p>
|
||||
@@ -1772,7 +1768,7 @@ public class Functions {
|
||||
* the permission can't be configured in the security screen). Got it?</p>
|
||||
*/
|
||||
public static boolean isArtifactsPermissionEnabled() {
|
||||
return Boolean.getBoolean("hudson.security.ArtifactsPermission");
|
||||
return SystemProperties.getBoolean("hudson.security.ArtifactsPermission");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1787,7 +1783,7 @@ public class Functions {
|
||||
* control on the "Wipe Out Workspace" action.</p>
|
||||
*/
|
||||
public static boolean isWipeOutPermissionEnabled() {
|
||||
return Boolean.getBoolean("hudson.security.WipeOutPermission");
|
||||
return SystemProperties.getBoolean("hudson.security.WipeOutPermission");
|
||||
}
|
||||
|
||||
public static String createRenderOnDemandProxy(JellyContext context, String attributesToCapture) {
|
||||
|
||||
Reference in new issue
Block a user