From 2c1fdd26990b417a4e57fdaaa7fb30ddc2a9be17 Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Wed, 28 Mar 2018 10:07:32 +0200 Subject: [PATCH] Name sysprops more consistently with others https://wiki.jenkins.io/display/JENKINS/Features+controlled+by+system+properties --- core/src/main/java/jenkins/model/Jenkins.java | 4 ++-- .../model/JenkinsBuildsAndWorkspacesDirectoriesTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 2e9030c4c6..e9235835cc 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -5102,13 +5102,13 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve * System property name to set {@link #buildsDir}. * @see #getRawBuildsDir() */ - static final String BUILDS_DIR_PROP = Jenkins.class.getName() + ".BUILDS_DIR"; + static final String BUILDS_DIR_PROP = Jenkins.class.getName() + ".buildsDir"; /** * System property name to set {@link #workspaceDir}. * @see #getRawWorkspaceDir() */ - static final String WORKSPACES_DIR_PROP = Jenkins.class.getName() + ".WORKSPACES_DIR"; + static final String WORKSPACES_DIR_PROP = Jenkins.class.getName() + ".workspacesDir"; /** * Automatically try to launch an agent when Jenkins is initialized or a new agent computer is created. diff --git a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java index 462e2d1cbb..7f6d6c4502 100644 --- a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java +++ b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java @@ -168,11 +168,11 @@ public class JenkinsBuildsAndWorkspacesDirectoriesTest { } private void setWorkspacesDirProperty(String workspacesDir) { - System.setProperty("jenkins.model.Jenkins.WORKSPACES_DIR", workspacesDir); + System.setProperty(Jenkins.WORKSPACES_DIR_PROP, workspacesDir); } private void setBuildsDirProperty(String buildsDir) { - System.setProperty("jenkins.model.Jenkins.BUILDS_DIR", buildsDir); + System.setProperty(Jenkins.BUILDS_DIR_PROP, buildsDir); } private boolean logWasFound(String searched) {