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/05/07 12:45:03 UTC
svn commit: r1479851 - in /archiva/sandbox/trunk/metadata-store-cassandra:
./ src/main/java/org/apache/archiva/metadata/repository/jpa/model/
src/test/filtered-resources/META-INF/
src/test/java/org/apache/archiva/metadata/repository/jpa/
Author: olamy
Date: Tue May 7 10:45:03 2013
New Revision: 1479851
URL: http://svn.apache.org/r1479851
Log:
ignore
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/ (props changed)
archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/model/Repository.java
archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
Propchange: archiva/sandbox/trunk/metadata-store-cassandra/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue May 7 10:45:03 2013
@@ -0,0 +1,2 @@
+target
+*.iml
Modified: archiva/sandbox/trunk/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/pom.xml?rev=1479851&r1=1479850&r2=1479851&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/pom.xml (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/pom.xml Tue May 7 10:45:03 2013
@@ -56,9 +56,23 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>info.archinnov</groupId>
+ <artifactId>achilles</artifactId>
+ <version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- FIXME -->
+ <!-- due to some instanceof in kundera it's mandatory -->
+ <!--
+ <dependency>
<groupId>com.impetus.client</groupId>
<artifactId>kundera-cassandra</artifactId>
- <version>2.5</version>
+ <version>2.6-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -68,19 +82,19 @@
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
- <!-- FIXME -->
- <!-- due to some instanceof in kundera it's mandatory
+
<exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</exclusion>
- -->
+
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
@@ -100,6 +114,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<testResources>
@@ -150,4 +170,6 @@
</plugin>
</plugins>
</build>
+
+
</project>
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/model/Repository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/model/Repository.java?rev=1479851&r1=1479850&r2=1479851&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/model/Repository.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/model/Repository.java Tue May 7 10:45:03 2013
@@ -1,6 +1,5 @@
package org.apache.archiva.metadata.repository.jpa.model;
-import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml?rev=1479851&r1=1479850&r2=1479851&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml Tue May 7 10:45:03 2013
@@ -22,5 +22,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean id="achillesEntityManagerFactory" class="info.archinnov.achilles.integration.spring.ThriftEntityManagerFactoryBean"
+ init-method="initialize">
+ <property name="entityPackages" value="my.package1,my.package2"/>
+ <property name="cassandraHost" value="localhost:9160"/>
+ <property name="clusterName" value="Test Cluster"/>
+ <property name="keyspaceName" value="Test Keyspace"/>
+ <property name="forceColumnFamilyCreation" value="true" />
+ </bean>
</beans>
\ No newline at end of file
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java?rev=1479851&r1=1479850&r2=1479851&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java Tue May 7 10:45:03 2013
@@ -1,5 +1,6 @@
package org.apache.archiva.metadata.repository.jpa;
+import info.archinnov.achilles.entity.manager.ThriftEntityManager;
import org.apache.archiva.metadata.repository.jpa.model.Repository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.fest.assertions.api.Assertions;
@@ -9,6 +10,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -23,16 +25,15 @@ import java.util.List;
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class RepositoriesNamespaceTest
{
- EntityManagerFactory emf = null;
-
- EntityManager em = null;
+ @Inject
+ private ThriftEntityManager em;
@Before
public void setup()
throws Exception
{
- emf = Persistence.createEntityManagerFactory( "archiva_meta" );
- em = emf.createEntityManager();
+ //emf = Persistence.createEntityManagerFactory( "archiva" );
+ //em = emf.createEntityManager();
}
@After
@@ -40,7 +41,7 @@ public class RepositoriesNamespaceTest
throws Exception
{
em.close();
- emf.close();
+ //emf.close();
}
@Test
@@ -57,8 +58,6 @@ public class RepositoriesNamespaceTest
em.flush();
- em.clear();
-
Repository repositoryFromData = em.find( Repository.class, "releases" );
Assertions.assertThat( repositoryFromData ).isNotNull();