diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-11-07 08:29:35 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-11-07 08:29:35 +0000 |
| commit | cef293cf574359cda04473e4010ee3c1b7059ee8 (patch) | |
| tree | 20abdc47da5da588840a09e4e446671326363d58 /archiva-modules/archiva-web/archiva-webdav | |
| parent | 972142978631964541c91004d18ddc3588041d07 (diff) | |
| download | archiva-cef293cf574359cda04473e4010ee3c1b7059ee8.tar.gz archiva-cef293cf574359cda04473e4010ee3c1b7059ee8.zip | |
move jdbc test url and jdbc test driver to properties to be able to change that in one place
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1198646 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webdav')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webdav/pom.xml | 4 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 6047ef797..3b6b83bcd 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -199,8 +199,8 @@ <derby.system.home>${project.build.directory}/appserver-base</derby.system.home> <test.resources.path>${project.build.testOutputDirectory}</test.resources.path> <archiva.user.configFileName>${project.build.testOutputDirectory}/repository-archiva.xml</archiva.user.configFileName> - <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url> - <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name> + <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url> + <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> </systemPropertyVariables> <forkMode>${webdav.forkMode}</forkMode> </configuration> diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index a4341ced0..de71e9d15 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -1215,7 +1215,7 @@ public class ArchivaDavResourceFactory if ( tmp != null && tmp.getDirectory() != null && tmp.getDirectory().exists() ) { - if ( System.currentTimeMillis() - tmp.getCreationTime() > ( IndexMerger.DEFAULT_GROUP_INDEX_TTL * 60 + if ( System.currentTimeMillis() - tmp.getCreationTime() > ( indexMerger.getDefaultGroupIndexTtl() * 60 * 1000 ) ) { log.debug( "tmp group index is too old so delete it" ); |