diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java new file mode 100644 index 0000000000..bec1d4ed00 --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryType.java @@ -0,0 +1,90 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.repository; + +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.Type; +import sonia.scm.repository.api.Command; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.Set; + +/** + * + * @author Sebastian Sdorra + * @since 1.18 + */ +public class RepositoryType extends Type +{ + + /** + * Constructs {@link RepositoryType} object. + * This constructor is required for JAXB. + * + */ + public RepositoryType() {} + + /** + * Constructs ... + * + * + * @param name + * @param displayName + * @param supportedCommands + */ + public RepositoryType(String name, String displayName, + Set supportedCommands) + { + super(name, displayName); + this.supportedCommands = supportedCommands; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + public Set getSupportedCommands() + { + return supportedCommands; + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private Set supportedCommands; +} diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java index 372d6deaf1..6db4473f7c 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java @@ -44,6 +44,7 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import sonia.scm.Type; import sonia.scm.io.FileSystem; import sonia.scm.plugin.ext.Extension; +import sonia.scm.repository.spi.GitRepositoryServiceProvider; import sonia.scm.store.StoreFactory; import sonia.scm.util.AssertUtil; @@ -59,7 +60,7 @@ import java.io.IOException; @Singleton @Extension public class GitRepositoryHandler - extends AbstractSimpleRepositoryHandler + extends AbstractSimpleRepositoryHandler { /** Field description */ @@ -76,7 +77,9 @@ public class GitRepositoryHandler public static final String TYPE_NAME = "git"; /** Field description */ - public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME); + public static final Type TYPE = new RepositoryType(TYPE_NAME, + TYPE_DISPLAYNAME, + GitRepositoryServiceProvider.COMMANDS); //~--- constructors --------------------------------------------------------- @@ -254,7 +257,7 @@ public class GitRepositoryHandler */ @Override protected void create(Repository repository, File directory) - throws RepositoryException, IOException + throws RepositoryException, IOException { FileRepository fr = null; diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java index 50f9d720e8..fd51c3f7c5 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java @@ -55,7 +55,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider { /** Field description */ - private static final Set COMMANDS = ImmutableSet.of(Command.BLAME, + public static final Set COMMANDS = ImmutableSet.of(Command.BLAME, Command.BROWSE, Command.CAT, Command.DIFF, Command.LOG, Command.TAGS, diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java index f883b571af..59d78efb06 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java @@ -55,6 +55,7 @@ import sonia.scm.io.INIConfigurationReader; import sonia.scm.io.INIConfigurationWriter; import sonia.scm.io.INISection; import sonia.scm.plugin.ext.Extension; +import sonia.scm.repository.spi.HgRepositoryServiceProvider; import sonia.scm.store.StoreFactory; import sonia.scm.util.AssertUtil; import sonia.scm.util.IOUtil; @@ -80,7 +81,7 @@ import javax.xml.bind.JAXBException; @Singleton @Extension public class HgRepositoryHandler - extends AbstractSimpleRepositoryHandler + extends AbstractSimpleRepositoryHandler { /** Field description */ @@ -97,7 +98,9 @@ public class HgRepositoryHandler public static final String TYPE_NAME = "hg"; /** Field description */ - public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME); + public static final Type TYPE = new RepositoryType(TYPE_NAME, + TYPE_DISPLAYNAME, + HgRepositoryServiceProvider.COMMANDS); /** the logger for HgRepositoryHandler */ private static final Logger logger = @@ -119,7 +122,7 @@ public class HgRepositoryHandler */ @Inject public HgRepositoryHandler(StoreFactory storeFactory, FileSystem fileSystem, - Provider hgContextProvider) + Provider hgContextProvider) { super(storeFactory, fileSystem); this.hgContextProvider = hgContextProvider; @@ -127,8 +130,8 @@ public class HgRepositoryHandler try { this.jaxbContext = JAXBContext.newInstance(BrowserResult.class, - BlameResult.class, Changeset.class, ChangesetPagingResult.class, - HgVersion.class); + BlameResult.class, Changeset.class, ChangesetPagingResult.class, + HgVersion.class); } catch (JAXBException ex) { @@ -153,7 +156,7 @@ public class HgRepositoryHandler if (logger.isDebugEnabled()) { logger.debug("installing mercurial with {}", - installer.getClass().getName()); + installer.getClass().getName()); } installer.install(baseDirectory, autoConfig); @@ -164,9 +167,8 @@ public class HgRepositoryHandler { if (logger.isErrorEnabled()) { - logger.error( - "Could not write Hg CGI for inital config. " - + "HgWeb may not function until a new Hg config is set", ioe); + logger.error("Could not write Hg CGI for inital config. " + + "HgWeb may not function until a new Hg config is set", ioe); } } } @@ -224,7 +226,7 @@ public class HgRepositoryHandler if (TYPE_NAME.equals(type)) { blameViewer = new HgBlameViewer(this, hgContextProvider.get(), - repository); + repository); } else { @@ -256,7 +258,7 @@ public class HgRepositoryHandler if (TYPE_NAME.equals(type)) { changesetViewer = new HgChangesetViewer(this, jaxbContext, - hgContextProvider.get(), repository); + hgContextProvider.get(), repository); } else { @@ -278,7 +280,7 @@ public class HgRepositoryHandler */ @Override public DiffViewer getDiffViewer(Repository repository) - throws RepositoryException + throws RepositoryException { DiffViewer diffViewer = null; @@ -374,7 +376,7 @@ public class HgRepositoryHandler } version = MessageFormat.format(version, hgVersion.getPython(), - hgVersion.getMercurial()); + hgVersion.getMercurial()); } else if (logger.isWarnEnabled()) { @@ -478,7 +480,7 @@ public class HgRepositoryHandler * @return */ HgChangesetViewer getChangesetViewer(File repositoryDirectory, - HgContext context) + HgContext context) { AssertUtil.assertIsNotNull(repositoryDirectory); AssertUtil.assertIsNotNull(context); @@ -503,7 +505,7 @@ public class HgRepositoryHandler { hooksSection.setParameter("changegroup.scm", "python:scmhooks.callback"); hooksSection.setParameter("pretxnchangegroup.scm", - "python:scmhooks.callback"); + "python:scmhooks.callback"); } /** @@ -532,7 +534,7 @@ public class HgRepositoryHandler */ @Override protected ExtendedCommand buildCreateCommand(Repository repository, - File directory) + File directory) { ExtendedCommand cmd = new ExtendedCommand(config.getHgBinary(), "init", directory.getAbsolutePath()); @@ -555,7 +557,7 @@ public class HgRepositoryHandler */ @Override protected void postCreate(Repository repository, File directory) - throws IOException, RepositoryException + throws IOException, RepositoryException { File hgrcFile = new File(directory, PATH_HGRC); INIConfiguration hgrc = new INIConfiguration(); @@ -597,7 +599,7 @@ public class HgRepositoryHandler * @return */ private boolean appendHook(String repositoryName, INISection hooks, - String hookName) + String hookName) { boolean write = false; String hook = hooks.getParameter(hookName); @@ -607,7 +609,7 @@ public class HgRepositoryHandler if (logger.isInfoEnabled()) { logger.info("register missing {} hook for respository {}", hookName, - repositoryName); + repositoryName); } hooks.setParameter(hookName, "python:scmhooks.callback"); @@ -728,7 +730,7 @@ public class HgRepositoryHandler else if (logger.isDebugEnabled()) { logger.debug( - "repository directory does not exists, could not register missing hooks"); + "repository directory does not exists, could not register missing hooks"); } } else if (logger.isDebugEnabled()) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java index 3cc88e6c00..f233589292 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java @@ -59,7 +59,7 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider { /** Field description */ - private static final Set COMMANDS = ImmutableSet.of(Command.BLAME, + public static final Set COMMANDS = ImmutableSet.of(Command.BLAME, Command.BROWSE, Command.CAT, Command.DIFF, Command.LOG, Command.TAGS, diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java index 91a4bc1beb..919b34d906 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java @@ -53,6 +53,7 @@ import sonia.scm.Type; import sonia.scm.io.FileSystem; import sonia.scm.logging.SVNKitLogger; import sonia.scm.plugin.ext.Extension; +import sonia.scm.repository.spi.SvnRepositoryServiceProvider; import sonia.scm.store.StoreFactory; import sonia.scm.util.AssertUtil; import sonia.scm.util.Util; @@ -86,7 +87,9 @@ public class SvnRepositoryHandler public static final String TYPE_NAME = "svn"; /** Field description */ - public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME); + public static final Type TYPE = new RepositoryType(TYPE_NAME, + TYPE_DISPLAYNAME, + SvnRepositoryServiceProvider.COMMANDS); /** the logger for SvnRepositoryHandler */ private static final Logger logger = diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java index eb260209dc..ba0e9cf888 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java @@ -52,7 +52,7 @@ public class SvnRepositoryServiceProvider extends RepositoryServiceProvider { /** Field description */ - private static final Set COMMANDS = ImmutableSet.of(Command.BLAME, + public static final Set COMMANDS = ImmutableSet.of(Command.BLAME, Command.BROWSE, Command.CAT, Command.DIFF, Command.LOG);