From 5b92d9b986c49f8bc73677aeaba0a7a3f0495c10 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 3 Jan 2007 07:01:02 +0000 Subject: [PATCH] SCM code was moved to AbstractProject. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1603 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/AbstractProject.java | 4 ++++ core/src/main/java/hudson/model/Project.java | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index d2f890de51..23698d729e 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -10,6 +10,7 @@ import hudson.Launcher.LocalLauncher; import hudson.maven.MavenJob; import hudson.scm.NullSCM; import hudson.scm.SCM; +import hudson.scm.SCMS; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -402,6 +403,9 @@ public abstract class AbstractProject

,R extends A } try { + int scmidx = Integer.parseInt(req.getParameter("scm")); + setScm(SCMS.SCMS.get(scmidx).newInstance(req)); + for (Trigger t : triggers) t.stop(); buildDescribable(req, Triggers.TRIGGERS, triggers, "trigger"); diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index 66d9237bb4..1b99cad884 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -233,9 +233,6 @@ public class Project extends AbstractProject { req.setCharacterEncoding("UTF-8"); - int scmidx = Integer.parseInt(req.getParameter("scm")); - setScm(SCMS.SCMS.get(scmidx).newInstance(req)); - buildDescribable(req, BuildWrappers.WRAPPERS, buildWrappers, "wrapper"); buildDescribable(req, BuildStep.BUILDERS, builders, "builder"); buildDescribable(req, BuildStep.PUBLISHERS, publishers, "publisher");