Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-06-17 20:51:17 +02:00
Code Issues Packages Projects Releases Activity

New package for working copy related classes

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-08 18:18:43 +02:00
parent e968aa17ef
commit f74b7626eb
40 changed files with 66 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/repository/api/ModifyCommandBuilder.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.api;
import com.google.common.base.Preconditions;
@@ -34,7 +34,7 @@ import sonia.scm.repository.Person;
import sonia.scm.repository.spi.ModifyCommand;
import sonia.scm.repository.spi.ModifyCommandRequest;
import sonia.scm.repository.util.AuthorUtil;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.util.IOUtil;
import java.io.File;

4
scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.api;
import org.slf4j.Logger;
@@ -33,7 +33,7 @@ import sonia.scm.repository.PreProcessorUtil;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryPermissions;
import sonia.scm.repository.spi.RepositoryServiceProvider;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.WorkdirProvider;
import java.io.Closeable;
import java.io.IOException;

2
scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
View File

@@ -53,7 +53,7 @@ import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryPermissions;
import sonia.scm.repository.spi.RepositoryServiceProvider;
import sonia.scm.repository.spi.RepositoryServiceResolver;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.security.ScmSecurityException;
import java.util.Set;

45
scm-core/src/main/java/sonia/scm/repository/util/CloseableWrapper.java
View File

@@ -1,45 +0,0 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.util;
import java.util.function.Consumer;
public class CloseableWrapper<T extends AutoCloseable> implements AutoCloseable {
private final T wrapped;
private final Consumer<T> cleanup;
public CloseableWrapper(T wrapped, Consumer<T> cleanup) {
this.wrapped = wrapped;
this.cleanup = cleanup;
}
public T get() { return wrapped; }
@Override
public void close() {
cleanup.accept(wrapped);
}
}

2
scm-core/src/main/java/sonia/scm/repository/util/CachingAllWorkingCopyPool.java → scm-core/src/main/java/sonia/scm/repository/work/CachingAllWorkingCopyPool.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import com.google.common.base.Stopwatch;
import org.slf4j.Logger;

2
scm-core/src/main/java/sonia/scm/repository/util/NoneCachingWorkingCopyPool.java → scm-core/src/main/java/sonia/scm/repository/work/NoneCachingWorkingCopyPool.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import sonia.scm.util.IOUtil;

2
scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java → scm-core/src/main/java/sonia/scm/repository/work/SimpleWorkingCopyFactory.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
scm-core/src/main/java/sonia/scm/repository/util/WorkdirProvider.java → scm-core/src/main/java/sonia/scm/repository/work/WorkdirProvider.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import java.io.File;
import java.io.IOException;

2
scm-core/src/main/java/sonia/scm/repository/util/WorkingCopy.java → scm-core/src/main/java/sonia/scm/repository/work/WorkingCopy.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import sonia.scm.util.IOUtil;

2
scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyContext.java → scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyContext.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import sonia.scm.repository.Repository;

4
scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java → scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFactory.java
View File

@@ -22,9 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
import sonia.scm.plugin.ExtensionPoint;
package sonia.scm.repository.work;
public interface WorkingCopyFactory<R, W, C> {
WorkingCopy<R, W> createWorkingCopy(C repositoryContext, String initialBranch);

2
scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFailedException.java → scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFailedException.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
public class WorkingCopyFailedException extends Exception {
public WorkingCopyFailedException(String message) {

2
scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyPool.java → scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyPool.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import java.io.File;

2
scm-core/src/test/java/sonia/scm/repository/api/ModifyCommandBuilderTest.java
View File

@@ -37,7 +37,7 @@ import org.mockito.stubbing.Answer;
import sonia.scm.repository.Person;
import sonia.scm.repository.spi.ModifyCommand;
import sonia.scm.repository.spi.ModifyCommandRequest;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.WorkdirProvider;
import java.io.ByteArrayInputStream;
import java.io.File;

6
scm-core/src/test/java/sonia/scm/repository/api/RepositoryServiceFactoryTest.java
View File

@@ -45,11 +45,13 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.spi.RepositoryServiceProvider;
import sonia.scm.repository.spi.RepositoryServiceResolver;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.WorkdirProvider;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class RepositoryServiceFactoryTest {

2
scm-core/src/test/java/sonia/scm/repository/util/CachingAllWorkingCopyPoolTest.java → scm-core/src/test/java/sonia/scm/repository/work/CachingAllWorkingCopyPoolTest.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

3
scm-core/src/test/java/sonia/scm/repository/util/SimpleWorkingCopyFactoryTest.java → scm-core/src/test/java/sonia/scm/repository/work/SimpleWorkingCopyFactoryTest.java
View File

@@ -22,8 +22,7 @@
* SOFTWARE.
*/
package sonia.scm.repository.util;
package sonia.scm.repository.work;
import org.junit.Before;
import org.junit.Rule;

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkingCopyFactory.java
View File

@@ -26,7 +26,7 @@ package sonia.scm.repository;
import org.eclipse.jgit.lib.Repository;
import sonia.scm.repository.spi.GitContext;
import sonia.scm.repository.util.WorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyFactory;
public interface GitWorkingCopyFactory extends WorkingCopyFactory<Repository, Repository, GitContext> {
}

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
View File

@@ -45,7 +45,7 @@ import sonia.scm.repository.GitUtil;
import sonia.scm.repository.GitWorkingCopyFactory;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.Person;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.WorkingCopy;
import sonia.scm.user.User;
import java.io.IOException;

6
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactory.java
View File

@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
import sonia.scm.repository.GitUtil;
import sonia.scm.repository.GitWorkingCopyFactory;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.util.WorkingCopyPool;
import sonia.scm.repository.util.SimpleWorkingCopyFactory;
import sonia.scm.repository.util.WorkingCopyPool.ParentAndClone;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool.ParentAndClone;
import sonia.scm.util.SystemUtil;
import javax.inject.Inject;

55
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
View File

@@ -1,55 +0,0 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import org.junit.Test;
import sonia.scm.repository.util.CloseableWrapper;
import java.util.function.Consumer;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
public class CloseableWrapperTest {
@Test
public void shouldExecuteGivenMethodAtClose() {
Consumer<AutoCloseable> wrapped = new Consumer<AutoCloseable>() {
// no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy
@Override
public void accept(AutoCloseable s) {
}
};
Consumer<AutoCloseable> closer = spy(wrapped);
AutoCloseable autoCloseable = () -> {};
try (CloseableWrapper<AutoCloseable> wrapper = new CloseableWrapper<>(autoCloseable, closer)) {
// nothing to do here
}
verify(closer).accept(autoCloseable);
}
}

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
View File

@@ -44,8 +44,8 @@ import sonia.scm.repository.GitWorkingCopyFactory;
import sonia.scm.repository.Person;
import sonia.scm.repository.api.MergeCommandResult;
import sonia.scm.repository.api.MergeStrategy;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.user.User;
import java.io.BufferedWriter;

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommand_Conflict_Test.java
View File

@@ -27,8 +27,8 @@ package sonia.scm.repository.spi;
import org.junit.Rule;
import org.junit.Test;
import sonia.scm.repository.spi.MergeConflictResult.SingleMergeConflict;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import java.io.IOException;

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java
View File

@@ -42,8 +42,8 @@ import sonia.scm.BadRequestException;
import sonia.scm.ConcurrentModificationException;
import sonia.scm.NotFoundException;
import sonia.scm.repository.Person;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.web.lfs.LfsBlobStoreFactory;
import java.io.File;

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_LFSTest.java
View File

@@ -35,8 +35,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import sonia.scm.repository.Person;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.store.Blob;
import sonia.scm.store.BlobStore;
import sonia.scm.web.lfs.LfsBlobStoreFactory;

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_withEmptyRepositoryTest.java
View File

@@ -38,8 +38,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import sonia.scm.repository.Person;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.web.lfs.LfsBlobStoreFactory;
import java.io.File;

6
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactoryTest.java
View File

@@ -38,9 +38,9 @@ import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.PreProcessorUtil;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.api.HookContextFactory;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.repository.work.WorkingCopy;
import java.io.File;
import java.io.IOException;

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java
View File

@@ -34,7 +34,7 @@ import sonia.scm.ContextEntry;
import sonia.scm.repository.Branch;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.api.BranchRequest;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.WorkingCopy;
import sonia.scm.user.User;
/**

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java
View File

@@ -33,7 +33,7 @@ import com.aragost.javahg.commands.RemoveCommand;
import com.aragost.javahg.commands.StatusCommand;
import sonia.scm.NoChangesMadeException;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.WorkingCopy;
import java.io.File;
import java.io.IOException;

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgWorkingCopyFactory.java
View File

@@ -26,7 +26,7 @@ package sonia.scm.repository.spi;
import com.aragost.javahg.Repository;
import com.aragost.javahg.commands.PullCommand;
import sonia.scm.repository.util.WorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyFactory;
public interface HgWorkingCopyFactory extends WorkingCopyFactory<Repository, Repository, HgCommandContext> {
void configure(PullCommand pullCommand);

8
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java
View File

@@ -32,10 +32,10 @@ import com.aragost.javahg.commands.PullCommand;
import com.aragost.javahg.commands.StatusCommand;
import com.aragost.javahg.commands.UpdateCommand;
import com.aragost.javahg.commands.flags.CloneCommandFlags;
import sonia.scm.repository.util.WorkingCopyFailedException;
import sonia.scm.repository.util.WorkingCopyPool;
import sonia.scm.repository.util.SimpleWorkingCopyFactory;
import sonia.scm.repository.util.WorkingCopyPool.ParentAndClone;
import sonia.scm.repository.work.WorkingCopyFailedException;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool.ParentAndClone;
import sonia.scm.util.IOUtil;
import sonia.scm.web.HgRepositoryEnvironmentBuilder;

4
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java
View File

@@ -32,8 +32,8 @@ import sonia.scm.repository.Branch;
import sonia.scm.repository.HgTestUtil;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.api.BranchRequest;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.web.HgRepositoryEnvironmentBuilder;
import java.util.List;

4
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModifyCommandTest.java
View File

@@ -35,8 +35,8 @@ import sonia.scm.NotFoundException;
import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.HgTestUtil;
import sonia.scm.repository.Person;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.web.HgRepositoryEnvironmentBuilder;
import java.io.File;

8
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactoryTest.java
View File

@@ -26,17 +26,15 @@ package sonia.scm.repository.spi;
import com.aragost.javahg.Repository;
import com.google.inject.util.Providers;
import org.assertj.core.api.Assertions;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.HgTestUtil;
import sonia.scm.repository.util.CachingAllWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.CachingAllWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.repository.work.WorkingCopy;
import sonia.scm.web.HgRepositoryEnvironmentBuilder;
import java.io.File;

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnWorkingCopyFactory.java
View File

@@ -25,7 +25,7 @@
package sonia.scm.repository;
import sonia.scm.repository.spi.SvnContext;
import sonia.scm.repository.util.WorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyFactory;
import java.io.File;

6
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactory.java
View File

@@ -35,9 +35,9 @@ import org.tmatesoft.svn.core.wc2.SvnTarget;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.Repository;
import sonia.scm.repository.SvnWorkingCopyFactory;
import sonia.scm.repository.util.WorkingCopyPool;
import sonia.scm.repository.util.SimpleWorkingCopyFactory;
import sonia.scm.repository.util.WorkingCopyPool.ParentAndClone;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool.ParentAndClone;
import javax.inject.Inject;
import java.io.File;

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModifyCommand.java
View File

@@ -34,7 +34,7 @@ import org.tmatesoft.svn.core.wc.SVNWCUtil;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.Repository;
import sonia.scm.repository.SvnWorkingCopyFactory;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.WorkingCopy;
import java.io.File;
import java.io.IOException;

6
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactoryTest.java
View File

@@ -30,9 +30,9 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.tmatesoft.svn.core.SVNException;
import sonia.scm.repository.Repository;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.repository.work.WorkingCopy;
import java.io.File;
import java.io.IOException;

6
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnModifyCommandTest.java
View File

@@ -33,9 +33,9 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import sonia.scm.AlreadyExistsException;
import sonia.scm.repository.Person;
import sonia.scm.repository.util.NoneCachingWorkingCopyPool;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.repository.util.WorkingCopy;
import sonia.scm.repository.work.NoneCachingWorkingCopyPool;
import sonia.scm.repository.work.WorkdirProvider;
import sonia.scm.repository.work.WorkingCopy;
import java.io.File;
import java.io.IOException;

4
scm-webapp/src/main/java/sonia/scm/lifecycle/modules/WorkingCopyPoolModule.java
View File

@@ -26,10 +26,10 @@ package sonia.scm.lifecycle.modules;
import com.google.inject.AbstractModule;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.repository.util.WorkingCopyPool;
import sonia.scm.repository.work.WorkingCopyPool;
public class WorkingCopyPoolModule extends AbstractModule {
public static final String DEFAULT_WORKING_COPY_POOL_STRATEGY = "sonia.scm.repository.util.NoneCachingWorkingCopyPool";
public static final String DEFAULT_WORKING_COPY_POOL_STRATEGY = "sonia.scm.repository.work.NoneCachingWorkingCopyPool";
public static final String WORKING_COPY_POOL_STRATEGY_PROPERTY = "scm.workingCopyPoolStrategy";
private final PluginLoader pluginLoader;