From facfd28a6c56c7bb6eae740a80518605aa4ca259 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 8 Nov 2017 17:56:19 +0100 Subject: [PATCH] Remove SVN Kit support --- .../org/argeo/slc/lib/svn/SvnKitDriver.java | 182 ------------------ pom.xml | 2 +- 2 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 org.argeo.slc.support/src/org/argeo/slc/lib/svn/SvnKitDriver.java diff --git a/org.argeo.slc.support/src/org/argeo/slc/lib/svn/SvnKitDriver.java b/org.argeo.slc.support/src/org/argeo/slc/lib/svn/SvnKitDriver.java deleted file mode 100644 index e75b199e8..000000000 --- a/org.argeo.slc.support/src/org/argeo/slc/lib/svn/SvnKitDriver.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.lib.svn; - -import java.io.File; -import java.io.OutputStream; -import java.util.List; -import java.util.Vector; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.SlcException; -import org.argeo.slc.deploy.VersioningDriver; -import org.tmatesoft.svn.core.SVNDepth; -import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.SVNURL; -import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; -import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory; -import org.tmatesoft.svn.core.io.SVNRepository; -import org.tmatesoft.svn.core.wc.SVNClientManager; -import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNWCUtil; -import org.tmatesoft.svn.core.wc.admin.ISVNChangeEntryHandler; -import org.tmatesoft.svn.core.wc.admin.SVNChangeEntry; - -/** Versioning driver with a Subversion backen, based on SVNKit */ -public class SvnKitDriver implements VersioningDriver { - private final static Log log = LogFactory.getLog(SvnKitDriver.class); - - private final SVNClientManager manager; - - public SvnKitDriver() { - DAVRepositoryFactory.setup(); - FSRepositoryFactory.setup(); - manager = SVNClientManager.newInstance(); - } - - @SuppressWarnings("deprecation") - public void updateToHead(File fileOrDir) { - try { - manager.getUpdateClient().doUpdate(fileOrDir, SVNRevision.HEAD, - true); - } catch (Exception e) { - throw new SlcException("Cannot update " + fileOrDir, e); - } - } - - @SuppressWarnings("deprecation") - public void importFileOrDir(String repositoryUrl, File fileOrDir) { - try { - manager.getCommitClient().doImport(fileOrDir, - SVNURL.parseURIDecoded(repositoryUrl), - "Import " + fileOrDir, true); - } catch (Exception e) { - throw new SlcException("Cannot import " + repositoryUrl + " to " - + fileOrDir, e); - } - } - - public Boolean checkout(String repositoryUrl, File destDir, - Boolean recursive) { - try { - SVNRevision previousRevision = null; - if (destDir.exists() && SVNWCUtil.isVersionedDirectory(destDir)) { - previousRevision = manager.getWCClient().doInfo(destDir, null) - .getRevision(); - } - if (previousRevision == null && log.isDebugEnabled()) - log.debug("Checking out " + repositoryUrl + " to " + destDir - + "..."); - long revision = manager.getUpdateClient().doCheckout( - SVNURL.parseURIDecoded(repositoryUrl), destDir, - SVNRevision.UNDEFINED, SVNRevision.HEAD, SVNDepth.INFINITY, - recursive); - if (previousRevision != null - && previousRevision.getNumber() == revision) { - if (log.isTraceEnabled()) - log.trace(destDir + " already at revision " + revision); - return false; - - } else { - if (log.isDebugEnabled()) - if (previousRevision != null) - log.debug(destDir + " updated to revision " + revision - + " from " + previousRevision.getNumber()); - else - log.debug(destDir + " checked out to revision " - + revision); - return true; - } - } catch (Exception e) { - throw new SlcException("Cannot checkout " + repositoryUrl + " to " - + destDir, e); - } - } - - public void getFileFromRepository(String repositoryBaseUrl, - String location, OutputStream out) { - try { - SVNURL url = SVNURL.parseURIDecoded(repositoryBaseUrl); - SVNRepository repo = manager.createRepository(url, true); - repo.getFile(location, -1, null, out); - } catch (Exception e) { - throw new SlcException("Cannot retrieve file " + location - + " from " + repositoryBaseUrl, e); - } - - } - - public String getRelativePath(String repositoryUrl) { - try { - SVNURL url = SVNURL.parseURIDecoded(repositoryUrl); - SVNRepository repo = manager.createRepository(url, true); - return repo.getRepositoryPath(""); - } catch (Exception e) { - throw new SlcException("Cannot get relative path for " - + repositoryUrl, e); - } - } - - public String getRepositoryRoot(String repositoryUrl) { - try { - SVNURL url = SVNURL.parseURIDecoded(repositoryUrl); - SVNRepository repo = manager.createRepository(url, true); - return repo.getRepositoryRoot(true).toDecodedString(); - } catch (Exception e) { - throw new SlcException("Cannot get repository root for " - + repositoryUrl, e); - } - } - - public List getChangedPaths(File repositoryRoot, Long revision) { - try { - final List paths = new Vector(); - ISVNChangeEntryHandler handler = new ISVNChangeEntryHandler() { - public void handleEntry(SVNChangeEntry entry) - throws SVNException { - paths.add(entry.getPath()); - } - }; - manager.getLookClient().doGetChanged(repositoryRoot, - SVNRevision.create(revision), handler, false); - return paths; - } catch (Exception e) { - throw new SlcException("Cannot get changed paths at " - + repositoryRoot + " for revision " + revision, e); - } - } - - public void createRepository(String filePath) { - try { - manager.getAdminClient().doCreateRepository(new File(filePath), - null, false, false); - } catch (Exception e) { - throw new SlcException("Cannot create repository " + filePath, e); - } - } - - @SuppressWarnings("deprecation") - public void commit(File fileOrDir, String commitMessage) { - try { - manager.getCommitClient().doCommit(new File[] { fileOrDir }, true, - commitMessage, false, true); - } catch (Exception e) { - throw new SlcException("Cannot commit " + fileOrDir, e); - } - } - -} diff --git a/pom.xml b/pom.xml index 9df9436ac..58fc47461 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.69 + 2.1.70-SNAPSHOT org.argeo.slc argeo-slc -- 2.39.2