closes #219

FlashCards_Config/src/main/resources/default.properties

@@ -1,3 +1,4 @@
+# DataSource properties
 hibernate.connection.provider_class=com.zaxxer.hikari.hibernate.HikariConnectionProvider
 hibernate.hikari.dataSourceClassName=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
 hibernate.hikari.dataSource.url=jdbc:mysql://localhost/flashcardapp_db?useConfigs=maxPerformance&rewriteBatchedStatements=true
@@ -8,24 +9,29 @@ hibernate.hikari.dataSource.prepStmtCacheSize=250
 hibernate.hikari.dataSource.prepStmtCacheSqlLimit=2048
 hibernate.hikari.maximumPoolSize=10
 
+# Hibernate / JPA properties
 jpaVendorAdapter.showSql=true
 jpaVendorAdapter.database=MYSQL
 jpaVendorAdapter.databasePlatform=org.hibernate.dialect.MySQLDialect
-
 hibernate.hbm2ddl.auto=create
-
-hibernate.show_sql=false
-hibernate.format_sql=false
-
 hibernate.jdbc.batch_size=1000
 hibernate.order_inserts=true
 org.hibernate.flushMode=COMMIT
 use_sql_comments=false
 
+hibernate.show_sql=false
+hibernate.format_sql=false
+
 # client properties
 server.address=http://localhost:8080/api/
 server.loginname=apiuser
 server.password=apiuserpassword
 
+# cassandra properties
+cassandra.contactpoints=localhost
+cassandra.native_transport_port=9042
+cassandra.keyspace=flashcardsapp
+
+# Akka properties
 jdbc.batchsize=1000
 akka.workerCount=20

FlashCards_Repository/FlashCards_Repository_Cassandra/pom.xml

@@ -78,11 +78,6 @@
             <artifactId>hamcrest-all</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.cassandraunit</groupId>
-            <artifactId>cassandra-unit-spring</artifactId>
-        </dependency>
-
         <!-- logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -95,5 +90,11 @@
 	</dependencies>
 	<build>
 		<finalName>FlashCards_Repository_Cassandra</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cassandra-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
 	</build>
 </project>

FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/resources/META-INF/applicationContext-repository-cassandra.xml

@@ -5,7 +5,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd" >
 
-    <context:property-placeholder location="classpath:cassandra.properties" />
+    <context:property-placeholder location="classpath*:/default.properties,classpath*:/override.properties" order="1" ignore-unresolvable="true" />
 
     <import resource="classpath:META-INF/applicationContext-repository-cassandraNamespace.xml" />
 

FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/AbstractCassandraIntegrationTest.java

@@ -2,27 +2,23 @@
 
 import javax.inject.Inject;
 
-import org.cassandraunit.spring.CassandraDataSet;
-
-import org.cassandraunit.spring.EmbeddedCassandra;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
-import org.robbins.flashcards.cassandra.repository.executionlisteners.CassandraUnitDependencyInjectionTestExecutionListener;
 import org.robbins.flashcards.cassandra.repository.util.IntegrationTestUtils;
 import org.robbins.tests.IntegrationTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:META-INF/test-applicationContext-repository-cassandra.xml")
-@TestExecutionListeners({CassandraUnitDependencyInjectionTestExecutionListener.class,
-        DependencyInjectionTestExecutionListener.class})
-@EmbeddedCassandra(configuration = "flashcards-cassandra.yaml")
-@CassandraDataSet(value = {"cql/FlashCard.cql", "cql/Tag.cql", "cql/User.cql", "cql/Tag_FlashCard.cql"}, keyspace = "flashcardsapp")
+@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class,
+        DirtiesContextTestExecutionListener.class })
 @Category(IntegrationTest.class)
-public abstract class AbstractCassandraIntegrationTest {
+public abstract class AbstractCassandraIntegrationTest
+{
 
     @Inject
     public IntegrationTestUtils testUtils;