From df1e55186bfe561dec7cdc45870bdb47fabc1b09 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 8 Jul 2009 23:42:31 +0000 Subject: [PATCH] Rolling back r19373-19376 as discussed in http://www.nabble.com/attention-all-subversion-users-td24335693.html to proceed with the 1.315 release git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19544 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/model/AbstractBuild.java | 7 +---- .../java/hudson/model/AbstractProject.java | 17 ----------- .../model/AbstractItem/configure-common.jelly | 1 - .../project/config-cleanWorkspace.jelly | 29 ------------------- .../help/project-config/cleanWorkspace.html | 7 ----- 5 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly delete mode 100644 war/resources/help/project-config/cleanWorkspace.html diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index d50189c4cf..6929715258 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -262,12 +262,7 @@ public abstract class AbstractBuild

,R extends Abs listener.getLogger().println(node instanceof Hudson ? Messages.AbstractBuild_BuildingOnMaster() : Messages.AbstractBuild_BuildingRemotely(builtOn)); node.getFileSystemProvisioner().prepareWorkspace(AbstractBuild.this,project.getWorkspace(),listener); - - if (project.isCleanWorkspaceRequired()) { - listener.getLogger().println("Cleaning workspace because project is configured to use a clean workspace for each build."); - project.getWorkspace().deleteContents(); - } - + checkout(listener); if(!preBuild(listener,project.getProperties())) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 14cc006bb5..4a96fd5234 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -160,11 +160,6 @@ public abstract class AbstractProject

,R extends A private transient boolean enableRemoteTrigger; private volatile BuildAuthorizationToken authToken = null; - - /** - * True to clean the workspace prior to each build. - */ - private volatile boolean cleanWorkspaceRequired; /** * List of all {@link Trigger}s for this project. @@ -341,10 +336,6 @@ public abstract class AbstractProject

,R extends A return disabled; } - public boolean isCleanWorkspaceRequired() { - return cleanWorkspaceRequired; - } - /** * Validates the retry count Regex */ @@ -368,8 +359,6 @@ public abstract class AbstractProject

,R extends A Hudson.getInstance().getQueue().cancel(this); save(); } - - @Override public BallColor getIconColor() { @@ -1204,12 +1193,6 @@ public abstract class AbstractProject

,R extends A canRoam = true; assignedNode = null; } - - if (req.getParameter("cleanWorkspaceRequired") != null) { - cleanWorkspaceRequired = true; - } else { - cleanWorkspaceRequired = false; - } authToken = BuildAuthorizationToken.create(req); diff --git a/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly b/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly index a6b09b8372..c5392e8f56 100644 --- a/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly +++ b/core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly @@ -63,7 +63,6 @@ THE SOFTWARE. - diff --git a/core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly b/core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly deleted file mode 100644 index ebddc1b0d5..0000000000 --- a/core/src/main/resources/lib/hudson/project/config-cleanWorkspace.jelly +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/war/resources/help/project-config/cleanWorkspace.html b/war/resources/help/project-config/cleanWorkspace.html deleted file mode 100644 index 8a93f6957c..0000000000 --- a/war/resources/help/project-config/cleanWorkspace.html +++ /dev/null @@ -1,7 +0,0 @@ -

-

- If your project requires a clean workspace for each build, select this option. - This will delete all contents inside the workspace folder at the beginning of - each build. A side-effect of this is that you will end up doing a fresh - checkout from source control for each build. -

\ No newline at end of file