Author: olamy
Date: Thu Nov 21 02:50:41 2013
New Revision: 1544015
URL: http://svn.apache.org/r1544015
Log:
fix sirona sys props for tomcat plugin and include sirona cassandra storage per
default
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/pom.xml
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=1544015&r1=1544014&r2=1544015&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Nov 21
02:50:41 2013
@@ -119,12 +119,12 @@
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-jcr</artifactId>
</dependency>
- <!--
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-cassandra</artifactId>
</dependency>
- -->
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
@@ -608,6 +608,10 @@
<classifier>classes</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.sirona</groupId>
+ <artifactId>sirona-cassandra</artifactId>
+ </dependency>
<dependency>
<groupId>cglib</groupId>
@@ -998,7 +1002,7 @@
-->
<cassandraHost>localhost</cassandraHost>
<cassandraPort>9160</cassandraPort>
-
<org.apache.sirona.configuration>${archiva.sirona.configuration}</org.apache.sirona.configuration>
+
<org.apache.sirona.configuration.sirona.properties>${archiva.sirona.configuration}</org.apache.sirona.configuration.sirona.properties>
</systemProperties>
<additionalClasspathDirs>
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1544015&r1=1544014&r2=1544015&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Nov 21 02:50:41 2013
@@ -943,6 +943,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.sirona</groupId>
+ <artifactId>sirona-cassandra</artifactId>
+ <version>${sirona.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>${plexus-utils.version}</version>
