| author | akozak | 2011-11-22 08:44:39 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:46:57 (EST) |
| commit | 1999b66db12fae3f0293361bb724b214bbaeea78 (patch) (side-by-side diff) | |
| tree | e27524c166e9828d66c732c7dc649e7dc7b76543 | |
| parent | bfd9d24e83469649b6679ea31d8c09c0603aede6 (diff) | |
| download | org.eclipse.hudson.core-1999b66db12fae3f0293361bb724b214bbaeea78.zip org.eclipse.hudson.core-1999b66db12fae3f0293361bb724b214bbaeea78.tar.gz org.eclipse.hudson.core-1999b66db12fae3f0293361bb724b214bbaeea78.tar.bz2 | |
CustomWorkspace constant was relocated to Job.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
3 files changed, 4 insertions, 5 deletions
diff --git a/hudson-core/src/main/java/hudson/matrix/MatrixProject.java b/hudson-core/src/main/java/hudson/matrix/MatrixProject.java index 357f2e9..88f3c29 100644 --- a/hudson-core/src/main/java/hudson/matrix/MatrixProject.java +++ b/hudson-core/src/main/java/hudson/matrix/MatrixProject.java @@ -1,6 +1,6 @@ /******************************************************************************* * - * Copyright (c) 2004-2009 Oracle Corporation. + * Copyright (c) 2004-2011 Oracle Corporation. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ * * Contributors: * -* Kohsuke Kawaguchi, Jorg Heymans, Red Hat, Inc., id:cactusman +* Kohsuke Kawaguchi, Jorg Heymans, Red Hat, Inc., id:cactusman, Anton Kozak, Nikita Levyankov * * *******************************************************************************/ @@ -94,7 +94,7 @@ public class MatrixProject extends AbstractProject<MatrixProject, MatrixBuild> i protected static final String COMBINATION_FILTER_PROPERTY_NAME = "combinationFilter"; protected static final String TOUCH_STONE_COMBINATION_FILTER_PROPERTY_NAME = "touchStoneCombinationFilter"; protected static final String TOUCH_STONE_RESULT_CONDITION_PROPERTY_NAME = "touchStoneResultCondition"; - protected static final String CUSTOM_WORKSPACE_PROPERTY_NAME = "customWorkspace"; + /** * Configuration axes. */ diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java index c35c127..cc4eaa9 100644 --- a/hudson-core/src/main/java/hudson/model/AbstractProject.java +++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java @@ -125,6 +125,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A public static final String BLOCK_BUILD_WHEN_UPSTREAM_BUILDING_PROPERTY_NAME = "blockBuildWhenUpstreamBuilding"; public static final String QUIET_PERIOD_PROPERTY_NAME = "quietPeriod"; public static final String SCM_CHECKOUT_RETRY_COUNT_PROPERTY_NAME = "scmCheckoutRetryCount"; + public static final String CUSTOM_WORKSPACE_PROPERTY_NAME = "customWorkspace"; /** * {@link SCM} associated with the project. diff --git a/hudson-core/src/main/java/hudson/model/FreeStyleProject.java b/hudson-core/src/main/java/hudson/model/FreeStyleProject.java index f35f922..775df14 100644 --- a/hudson-core/src/main/java/hudson/model/FreeStyleProject.java +++ b/hudson-core/src/main/java/hudson/model/FreeStyleProject.java @@ -36,8 +36,6 @@ import javax.servlet.ServletException; public class FreeStyleProject extends Project<FreeStyleProject,FreeStyleBuild> implements TopLevelItem, IFreeStyleProject { - public static final String CUSTOM_WORKSPACE_PROPERTY_NAME = "customWorkspace"; - /** * See {@link #setCustomWorkspace(String)}. * |