From de96e79418451793fef5b0f1147d8361bc27da4e Mon Sep 17 00:00:00 2001 From: jglick Date: Mon, 2 Apr 2007 23:13:38 +0000 Subject: [PATCH] Adding support for FishEye CVS as well as SVN. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2839 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/scm/RepositoryBrowsers.java | 4 +- .../java/hudson/scm/browsers/FishEyeCVS.java | 123 ++++++++++++++++++ .../scm/browsers/FishEyeCVS/config.jelly | 6 + .../help/scm-browsers/fisheye-cvs/url.html | 4 + 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 core/src/main/java/hudson/scm/browsers/FishEyeCVS.java create mode 100644 core/src/main/resources/hudson/scm/browsers/FishEyeCVS/config.jelly create mode 100644 war/resources/help/scm-browsers/fisheye-cvs/url.html diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java index c3c0775c25..e007d1e576 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java @@ -2,6 +2,7 @@ package hudson.scm; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; +import hudson.scm.browsers.FishEyeCVS; import hudson.scm.browsers.FishEyeSVN; import hudson.scm.browsers.ViewCVS; import hudson.scm.browsers.ViewSVN; @@ -22,7 +23,8 @@ public class RepositoryBrowsers { public static final List>> LIST = Descriptor.toList( ViewCVS.DESCRIPTOR, ViewSVN.DESCRIPTOR, - FishEyeSVN.DESCRIPTOR + FishEyeSVN.DESCRIPTOR, + FishEyeCVS.DESCRIPTOR ); /** diff --git a/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java b/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java new file mode 100644 index 0000000000..d1f5488cf3 --- /dev/null +++ b/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java @@ -0,0 +1,123 @@ +/* + * FishEyeCVS.java + * + * Created on Apr 2, 2007, 5:44:06 PM + * + * To change this template, choose Tools | Template Manager + * and open the template in the editor. + */ + +package hudson.scm.browsers; + +import hudson.Util; +import hudson.model.Descriptor; +import hudson.scm.CVSChangeLogSet; +import hudson.scm.CVSChangeLogSet.File; +import hudson.scm.CVSChangeLogSet.Revision; +import hudson.scm.CVSRepositoryBrowser; +import hudson.scm.RepositoryBrowser; +import hudson.util.FormFieldValidator; +import java.io.IOException; +import java.net.URL; +import java.util.regex.Pattern; +import javax.servlet.ServletException; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; + +/** + * Repository browser for CVS in a FishEye server. + */ +public final class FishEyeCVS extends CVSRepositoryBrowser { + + /** + * The URL of the FishEye repository, e.g. + * http://deadlock.nbextras.org/fisheye/browse/netbeans/ + */ + public final URL url; + + /** + * @stapler-constructor + */ + public FishEyeCVS(URL url) { + this.url = normalizeToEndWithSlash(url); + } + + @Override + public URL getDiffLink(File file) throws IOException { + Revision r = new Revision(file.getRevision()); + Revision p = r.getPrevious(); + if (p == null) { + return null; + } + return new URL(url, trimHeadSlash(file.getFullName()) + new QueryBuilder(url.getQuery()).add("r1=" + p).add("r2=" + r)); + } + + @Override + public URL getFileLink(File file) throws IOException { + return new URL(url, trimHeadSlash(file.getFullName()) + new QueryBuilder(url.getQuery()).add("r=" + file.getRevision())); + } + + @Override + public URL getChangeSetLink(CVSChangeLogSet.CVSChangeLog changeSet) throws IOException { + return null; + } + + @Override + public Descriptor> getDescriptor() { + return DESCRIPTOR; + } + + public static final Descriptor> DESCRIPTOR = new DescriptorImpl(); + + public static class DescriptorImpl extends Descriptor> { + + public DescriptorImpl() { + super(FishEyeCVS.class); + } + + @Override + public String getDisplayName() { + return "FishEye"; + } + + public void doCheck(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + new FormFieldValidator.URLCheck(req,rsp) { + @Override + protected void check() throws IOException, ServletException { + String value = Util.fixEmpty(request.getParameter("value")); + if (value == null) { + ok(); + return; + } + if (!value.endsWith("/")) { + value += '/'; + } + if (!URL_PATTERN.matcher(value).matches()) { + error("The URL should end like .../browse/foobar/"); + return; + } + try { + if (findText(open(new URL(value)), "FishEye")) { + ok(); + } else { + error("This is a valid URL but it doesn't look like FishEye"); + } + } catch (IOException e) { + handleIOException(value, e); + } + } + }.process(); + } + + @Override + public FishEyeCVS newInstance(StaplerRequest req) throws FormException { + return req.bindParameters(FishEyeCVS.class, "fisheye.cvs."); + } + + private static final Pattern URL_PATTERN = Pattern.compile(".+/browse/[^/]+/"); + + } + + private static final long serialVersionUID = 1L; + +} diff --git a/core/src/main/resources/hudson/scm/browsers/FishEyeCVS/config.jelly b/core/src/main/resources/hudson/scm/browsers/FishEyeCVS/config.jelly new file mode 100644 index 0000000000..4f7a50339c --- /dev/null +++ b/core/src/main/resources/hudson/scm/browsers/FishEyeCVS/config.jelly @@ -0,0 +1,6 @@ + + + + + diff --git a/war/resources/help/scm-browsers/fisheye-cvs/url.html b/war/resources/help/scm-browsers/fisheye-cvs/url.html new file mode 100644 index 0000000000..d230f1cb4e --- /dev/null +++ b/war/resources/help/scm-browsers/fisheye-cvs/url.html @@ -0,0 +1,4 @@ +
+ Specify the root URL of FishEye for this repository + (such as this.) +