summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-web-common
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-11-11 03:58:39 +0000
committerOlivier Lamy <olamy@apache.org>2013-11-11 03:58:39 +0000
commit1f5321ce2a6e091bc3cad8fe005ebf73aa734e78 (patch)
tree0281e3971cfcc9b1f04225a929c57bde3cd81a44 /archiva-modules/archiva-web/archiva-web-common
parent4b5e0379a5d251110eba9f7d27301b4852523f22 (diff)
downloadarchiva-1f5321ce2a6e091bc3cad8fe005ebf73aa734e78.tar.gz
archiva-1f5321ce2a6e091bc3cad8fe005ebf73aa734e78.zip
[MRM-1792] Integrate Apache Sirona Monitoring
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1540597 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-web-common')
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java6
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
index 10bbc7181..a63e6e250 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
@@ -40,6 +40,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.io.File;
+import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -55,9 +56,12 @@ public class DownloadMergedIndexTest
@BeforeClass
public static void setAppServerBase()
+ throws IOException
{
previousAppServerBase = System.getProperty( "appserver.base" );
- System.setProperty( "appserver.base", "target/" + DownloadMergedIndexTest.class.getName() );
+ System.setProperty( "appserver.base",
+ new File( System.getProperty( "java.io.tmpdir" ) ).getCanonicalPath() + "/target/"
+ + DownloadMergedIndexTest.class.getName() );
}
@AfterClass
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
index 43ffe6376..323c93f00 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
@@ -33,6 +33,8 @@
<logger name="org.apache.commons.configuration" level="error"/>
+ <logger name="org.apache.archiva.scheduler.indexing" level="debug"/>
+
<root level="info">
<appender-ref ref="console"/>
</root>