aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorMartin Stockhammer <martin.stockhammer@ars.de>2018-03-29 23:47:13 +0200
committerMartin Stockhammer <martin.stockhammer@ars.de>2018-03-29 23:47:13 +0200
commit9cd3c61340d8c62df6c88c82b4dfdce429eb947e (patch)
tree03c88d9b706e77ab63fb81e6bf0f49d543fa814c /archiva-modules/archiva-web
parentf18aa86c68f475c5932d818446f6dec644be635b (diff)
downloadarchiva-9cd3c61340d8c62df6c88c82b4dfdce429eb947e.tar.gz
archiva-9cd3c61340d8c62df6c88c82b4dfdce429eb947e.zip
Adding packedIndexDir
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java5
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java2
2 files changed, 5 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
index c4247c0f0..bb4e949fd 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
@@ -447,8 +447,11 @@ public abstract class AbstractArchivaRestTest
}
managedRepository.setLocation( Paths.get( repoPath ).toString() );
+ String suffix = Long.toString( new Date().getTime() );
+ String baseDir = System.getProperty("java.io.tmpdir");
managedRepository.setIndexDirectory(
- System.getProperty( "java.io.tmpdir" ) + "/.index-" + Long.toString( new Date().getTime() ) );
+ baseDir + "/.indexer-" + suffix );
+ managedRepository.setPackedIndexDirectory(baseDir + "/.index-" + suffix);
managedRepository.setStageRepoNeeded( stageNeeded );
managedRepository.setSnapshots( true );
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
index f870d42f6..36b96f4ad 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
@@ -161,7 +161,7 @@ public class DownloadMergedIndexTest
remoteRepository.setName( "all-merged" );
remoteRepository.setDownloadRemoteIndex( true );
remoteRepository.setUrl( "http://localhost:" + port + "/repository/test-group" );
- remoteRepository.setRemoteIndexUrl( "http://localhost:" + port + "/repository/test-group/.indexer" );
+ remoteRepository.setRemoteIndexUrl( "http://localhost:" + port + "/repository/test-group/.index" );
remoteRepository.setUserName( RedbackRoleConstants.ADMINISTRATOR_ACCOUNT_NAME );
remoteRepository.setPassword( FakeCreateAdminService.ADMIN_TEST_PWD );