diff options
| author | Martin Stockhammer <martin.stockhammer@ars.de> | 2018-10-25 12:25:33 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin.stockhammer@ars.de> | 2018-10-25 12:25:33 +0200 |
| commit | 1ce7039d4f570c61dd940df84c7913e16fae054c (patch) | |
| tree | df4f2477f0e5b27e70508c77046bf528d989f696 /archiva-modules/archiva-web | |
| parent | f9e51398514ba244c8f188327605176d7587f747 (diff) | |
| download | archiva-1ce7039d4f570c61dd940df84c7913e16fae054c.tar.gz archiva-1ce7039d4f570c61dd940df84c7913e16fae054c.zip | |
Adding env variable for user config file
Diffstat (limited to 'archiva-modules/archiva-web')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java index b798423d2..850b0a81d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java @@ -21,6 +21,7 @@ package org.apache.archiva.web.rss; import junit.framework.TestCase; +import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.codec.Encoder; import org.apache.commons.codec.binary.Base64; @@ -74,8 +75,8 @@ public class RssFeedServletTest public static void initConfigurationPath() throws Exception { - PREVIOUS_ARCHIVA_PATH = System.getProperty( "archiva.user.configFileName" ); - System.setProperty( "archiva.user.configFileName", + PREVIOUS_ARCHIVA_PATH = System.getProperty(ArchivaConfiguration.USER_CONFIG_PROPERTY); + System.setProperty( ArchivaConfiguration.USER_CONFIG_PROPERTY, System.getProperty( "test.resources.path/" ) + "empty-archiva.xml" ); } @@ -84,7 +85,7 @@ public class RssFeedServletTest public static void restoreConfigurationPath() throws Exception { - System.setProperty( "archiva.user.configFileName", PREVIOUS_ARCHIVA_PATH ); + System.setProperty( ArchivaConfiguration.USER_CONFIG_PROPERTY, PREVIOUS_ARCHIVA_PATH ); } @Before |