fix sirona sys props for tomcat plugin and include sirona cassandra storage per default

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 14f8201c63094d03af62c597e493497174b479ce..bef5f715063edeeddea20631173f160060bf14cc 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
index 3610d720fc2fddf21fa2ce4ea7152eb521d84232..cde85b6e98f44cefedc7390a892c0c3d5e187b4b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -942,6 +942,12 @@
         <classifier>classes</classifier>
       </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>