[MRM-1792] Integrate Apache Sirona Monitoring

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1540597 13f79535-47bb-0310-9956-ffa450edef68

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 10bbc7181f0f506d1b313dfb94693c7d277d48e6..a63e6e250b0e3826e65cbdbde9697e4b1ab1840e 100644 (file)
--- 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 43ffe6376d72e4ed849b01f6b4734c69f65c0d87..323c93f0045b49f39d5158b37f11533a3dd3431c 100644 (file)
--- 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>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 355459322b2c6f9b98a277d056fa50e92c4e6b19..f23a29f6185b06217f71dec439653fafd26f2159 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -594,6 +594,31 @@
       </exclusions>
     </dependency>
 
+
+    <!-- sirona -->
+    <dependency>
+      <groupId>org.apache.sirona</groupId>
+      <artifactId>sirona-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sirona</groupId>
+      <artifactId>sirona-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sirona</groupId>
+      <artifactId>sirona-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sirona</groupId>
+      <artifactId>sirona-spring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sirona</groupId>
+      <artifactId>sirona-reporting</artifactId>
+      <classifier>classes</classifier>
+    </dependency>
+
+
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
@@ -1001,6 +1026,7 @@
           <path>${tomcatRunPath}</path>
           <contextFile>${tomcatContextXml}</contextFile>
           <useTestClasspath>false</useTestClasspath>
+
           <systemProperties>
             <plexus.home>${archivaAppServerBase}</plexus.home>
             <appserver.base>${archivaAppServerBase}</appserver.base>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index 8d85152929e7dbe7dedb76abda56f8fa47e3c6f1..240248035b0aa5b2e3d08cf9781713c53a143d38 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -31,6 +31,17 @@
     </param-value>
   </context-param>
 
+  <!-- to activate sirona -->
+  <context-param>
+    <param-name>org.apache.sirona.reporting.activated</param-name>
+    <param-value>true</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>org.apache.sirona.reporting.mapping</param-name>
+    <param-value>/sirona-monitoring</param-value>
+  </context-param>
+
   <filter>
     <filter-name>encodingFilter</filter-name>
     <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>

diff --git a/pom.xml b/pom.xml
index 81772a3a938f9180790d0f9280c8f47b1b236cbc..3bfbe9dc203e76ba738696baab7a7515a63e04f6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,8 @@
     <lucene.version>3.6.2</lucene.version>
     <jackrabbit.version>2.6.3</jackrabbit.version>
 
+    <sirona.version>0.1-incubating-SNAPSHOT</sirona.version>
+
     <cxfVersion>2.6.10</cxfVersion>
     <derbyVersion>10.10.1.1</derbyVersion>
     <httpclient.version>4.3.1</httpclient.version>
@@ -910,6 +912,36 @@
         <artifactId>ant</artifactId>
         <version>1.8.3</version>
       </dependency>
+
+
+      <!-- sirona -->
+      <dependency>
+        <groupId>org.apache.sirona</groupId>
+        <artifactId>sirona-core</artifactId>
+        <version>${sirona.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sirona</groupId>
+        <artifactId>sirona-jdbc</artifactId>
+        <version>${sirona.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sirona</groupId>
+        <artifactId>sirona-spring</artifactId>
+        <version>${sirona.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sirona</groupId>
+        <artifactId>sirona-web</artifactId>
+        <version>${sirona.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sirona</groupId>
+        <artifactId>sirona-reporting</artifactId>
+        <version>${sirona.version}</version>
+        <classifier>classes</classifier>
+      </dependency>
+
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>