Author: olamy
Date: Thu Mar 20 23:22:05 2014
New Revision: 1579817
URL: http://svn.apache.org/r1579817
Log:
use a better name
Added:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
(contents, props changed)
- copied, changed from r1579221,
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
(contents, props changed)
- copied, changed from r1579221,
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Removed:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1579817&r1=1579816&r2=1579817&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
(original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Thu
Mar 20 23:22:05 2014
@@ -167,9 +167,35 @@
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
+ <groupId>org.hectorclient</groupId>
+ <artifactId>hector-core</artifactId>
+ <version>1.1-4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.ecyrd.speed4j</groupId>
+ <artifactId>speed4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.yammer.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-thrift</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
Copied:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
(from r1579221,
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java?p2=archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java&p1=archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java&r1=1579221&r2=1579817&rev=1579817&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
Thu Mar 20 23:22:05 2014
@@ -32,7 +32,7 @@ import org.apache.archiva.metadata.repos
* @author Olivier Lamy
* @since 2.0.0
*/
-public interface CassandraEntityManagerFactory
+public interface CassandraArchivaManager
{
Keyspace getKeyspace();
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1579817&r1=1579816&r2=1579817&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Thu Mar 20 23:22:05 2014
@@ -71,46 +71,46 @@ public class CassandraMetadataRepository
private final Map<String, MetadataFacetFactory> metadataFacetFactories;
- private CassandraEntityManagerFactory cassandraEntityManagerFactory;
+ private CassandraArchivaManager cassandraArchivaManager;
public CassandraMetadataRepository( Map<String, MetadataFacetFactory>
metadataFacetFactories,
ArchivaConfiguration configuration,
- CassandraEntityManagerFactory
cassandraEntityManagerFactory )
+ CassandraArchivaManager
cassandraArchivaManager )
{
this.metadataFacetFactories = metadataFacetFactories;
this.configuration = configuration;
- this.cassandraEntityManagerFactory = cassandraEntityManagerFactory;
+ this.cassandraArchivaManager = cassandraArchivaManager;
}
public EntityManager<Repository, String> getRepositoryEntityManager()
{
- return this.cassandraEntityManagerFactory.getRepositoryEntityManager();
+ return this.cassandraArchivaManager.getRepositoryEntityManager();
}
public EntityManager<Namespace, String> getNamespaceEntityManager()
{
- return this.cassandraEntityManagerFactory.getNamespaceEntityManager();
+ return this.cassandraArchivaManager.getNamespaceEntityManager();
}
public EntityManager<Project, String> getProjectEntityManager()
{
- return this.cassandraEntityManagerFactory.getProjectEntityManager();
+ return this.cassandraArchivaManager.getProjectEntityManager();
}
public EntityManager<ArtifactMetadataModel, String>
getArtifactMetadataModelEntityManager()
{
- return
cassandraEntityManagerFactory.getArtifactMetadataModelEntityManager();
+ return cassandraArchivaManager.getArtifactMetadataModelEntityManager();
}
public EntityManager<MetadataFacetModel, String>
getMetadataFacetModelEntityManager()
{
- return
this.cassandraEntityManagerFactory.getMetadataFacetModelEntityManager();
+ return
this.cassandraArchivaManager.getMetadataFacetModelEntityManager();
}
public EntityManager<ProjectVersionMetadataModel, String>
getProjectVersionMetadataModelEntityManager()
{
- return
this.cassandraEntityManagerFactory.getProjectVersionMetadataModelEntityManager();
+ return
this.cassandraArchivaManager.getProjectVersionMetadataModelEntityManager();
}
@Override
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java?rev=1579817&r1=1579816&r2=1579817&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
Thu Mar 20 23:22:05 2014
@@ -56,7 +56,7 @@ public class CassandraRepositorySessionF
private ApplicationContext applicationContext;
@Inject
- private CassandraEntityManagerFactory cassandraEntityManagerFactory;
+ private CassandraArchivaManager cassandraArchivaManager;
@PostConstruct
public void initialize()
@@ -80,7 +80,7 @@ public class CassandraRepositorySessionF
public RepositorySession createSession()
{
CassandraMetadataRepository metadataRepository =
- new CassandraMetadataRepository( metadataFacetFactories,
configuration, cassandraEntityManagerFactory );
+ new CassandraMetadataRepository( metadataFacetFactories,
configuration, cassandraArchivaManager );
return new RepositorySession( metadataRepository, metadataResolver );
}
Copied:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
(from r1579221,
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java?p2=archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java&p1=archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java&r1=1579221&r2=1579817&rev=1579817&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
Thu Mar 20 23:22:05 2014
@@ -28,10 +28,7 @@ import com.netflix.astyanax.connectionpo
import
com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolType;
import com.netflix.astyanax.connectionpool.impl.Slf4jConnectionPoolMonitorImpl;
-import com.netflix.astyanax.ddl.ColumnDefinition;
-import com.netflix.astyanax.ddl.ColumnFamilyDefinition;
import com.netflix.astyanax.ddl.KeyspaceDefinition;
-import com.netflix.astyanax.entitystore.CompositeEntityManager;
import com.netflix.astyanax.entitystore.DefaultEntityManager;
import com.netflix.astyanax.entitystore.EntityManager;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
@@ -51,7 +48,6 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.persistence.PersistenceException;
-import java.util.Map;
import java.util.Properties;
/**
@@ -61,8 +57,8 @@ import java.util.Properties;
* @since 2.0.0
*/
@Service( "archivaEntityManagerFactory#cassandra" )
-public class DefaultCassandraEntityManagerFactory
- implements CassandraEntityManagerFactory
+public class DefaultCassandraArchivaManager
+ implements CassandraArchivaManager
{
private Logger logger = LoggerFactory.getLogger( getClass() );
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1579817&r1=1579816&r2=1579817&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
Thu Mar 20 23:22:05 2014
@@ -21,12 +21,6 @@ package org.apache.archiva.metadata.repo
import org.apache.archiva.metadata.model.MetadataFacetFactory;
import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
-import
org.apache.archiva.metadata.repository.cassandra.model.ArtifactMetadataModel;
-import
org.apache.archiva.metadata.repository.cassandra.model.MetadataFacetModel;
-import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
-import org.apache.archiva.metadata.repository.cassandra.model.Project;
-import
org.apache.archiva.metadata.repository.cassandra.model.ProjectVersionMetadataModel;
-import org.apache.archiva.metadata.repository.cassandra.model.Repository;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
@@ -36,7 +30,6 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
-import java.util.List;
import java.util.Map;
/**
@@ -49,7 +42,7 @@ public class CassandraMetadataRepository
@Inject
@Named( value = "archivaEntityManagerFactory#cassandra" )
- CassandraEntityManagerFactory cassandraEntityManagerFactory;
+ CassandraArchivaManager cassandraArchivaManager;
CassandraMetadataRepository cmr;
@@ -67,7 +60,7 @@ public class CassandraMetadataRepository
Map<String, MetadataFacetFactory> factories =
createTestMetadataFacetFactories();
- this.cmr = new CassandraMetadataRepository( factories, null,
cassandraEntityManagerFactory );
+ this.cmr = new CassandraMetadataRepository( factories, null,
cassandraArchivaManager );
this.repository = this.cmr;
clearReposAndNamespace();
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1579817&r1=1579816&r2=1579817&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
Thu Mar 20 23:22:05 2014
@@ -20,7 +20,6 @@ package org.apache.archiva.metadata.repo
*/
import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
-import org.apache.archiva.metadata.repository.cassandra.model.Project;
import org.apache.archiva.metadata.repository.cassandra.model.Repository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.fest.assertions.api.Assertions;
@@ -34,7 +33,6 @@ import org.springframework.test.context.
import javax.inject.Inject;
import javax.inject.Named;
-import java.util.List;
/**
* @author Olivier Lamy
@@ -48,7 +46,7 @@ public class RepositoriesNamespaceTest
@Inject
@Named(value = "archivaEntityManagerFactory#cassandra")
- CassandraEntityManagerFactory cassandraEntityManagerFactory;
+ CassandraArchivaManager cassandraArchivaManager;
CassandraMetadataRepository cmr;
@@ -57,10 +55,10 @@ public class RepositoriesNamespaceTest
public void setup()
throws Exception
{
- cmr = new CassandraMetadataRepository( null, null,
cassandraEntityManagerFactory );
- if ( !cassandraEntityManagerFactory.started() )
+ cmr = new CassandraMetadataRepository( null, null,
cassandraArchivaManager );
+ if ( !cassandraArchivaManager.started() )
{
- cassandraEntityManagerFactory.start();
+ cassandraArchivaManager.start();
}
clearReposAndNamespace();
}
@@ -70,7 +68,7 @@ public class RepositoriesNamespaceTest
throws Exception
{
clearReposAndNamespace();
- cassandraEntityManagerFactory.shutdown();
+ cassandraArchivaManager.shutdown();
}
