You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/11 04:58:39 UTC
svn commit: r1540597 - in /archiva/trunk: ./
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/
archiva-modules/archiva-web/archiva-web-common/src/test/resources/
archiva-modules/archiva-web/archiva-webapp/ archiva-modules...
Author: olamy
Date: Mon Nov 11 03:58:39 2013
New Revision: 1540597
URL: http://svn.apache.org/r1540597
Log:
[MRM-1792] Integrate Apache Sirona Monitoring
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java?rev=1540597&r1=1540596&r2=1540597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java Mon Nov 11 03:58:39 2013
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml?rev=1540597&r1=1540596&r2=1540597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml Mon Nov 11 03:58:39 2013
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1540597&r1=1540596&r2=1540597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Nov 11 03:58:39 2013
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=1540597&r1=1540596&r2=1540597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml Mon Nov 11 03:58:39 2013
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1540597&r1=1540596&r2=1540597&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Nov 11 03:58:39 2013
@@ -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>