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/16 15:00:23 UTC
svn commit: r1483333 - in /archiva/sandbox/trunk/metadata-store-cassandra/src: main/java/org/apache/archiva/metadata/repository/cassandra/ test/java/org/apache/archiva/metadata/repository/cassandra/

Author: olamy
Date: Thu May 16 13:00:22 2013
New Revision: 1483333

URL: http://svn.apache.org/r1483333
Log:
shorter name

Added:
    archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java
      - copied, changed from r1483332, archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java
    archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java
      - copied, changed from r1483332, archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java
Removed:
    archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java
    archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java
Modified:
    archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
    archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
    archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java

Copied: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java (from r1483332, archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java)
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java?p2=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java&p1=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java&r1=1483332&r2=1483333&rev=1483333&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraEntityManagerFactory.java Thu May 16 13:00:22 2013
@@ -24,7 +24,7 @@ import com.netflix.astyanax.Keyspace;
 /**
  * @author Olivier Lamy
  */
-public interface ArchivaCassandraEntityManagerFactory
+public interface CassandraEntityManagerFactory
 {
     Keyspace getKeyspace();
 

Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java?rev=1483333&r1=1483332&r2=1483333&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java Thu May 16 13:00:22 2013
@@ -55,7 +55,7 @@ public class CassandraRepositorySessionF
     private ApplicationContext applicationContext;
 
     @Inject
-    private ArchivaCassandraEntityManagerFactory archivaCassandraEntityManagerFactory;
+    private CassandraEntityManagerFactory cassandraEntityManagerFactory;
 
     @PostConstruct
     public void initialize()
@@ -80,7 +80,7 @@ public class CassandraRepositorySessionF
     {
         CassandraMetadataRepository metadataRepository =
             new CassandraMetadataRepository( metadataFacetFactories, configuration,
-                                             archivaCassandraEntityManagerFactory.getKeyspace() );
+                                             cassandraEntityManagerFactory.getKeyspace() );
         return new RepositorySession( metadataRepository, metadataResolver );
     }
 

Copied: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java (from r1483332, archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java)
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java?p2=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java&p1=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java&r1=1483332&r2=1483333&rev=1483333&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraEntityManagerFactory.java Thu May 16 13:00:22 2013
@@ -40,8 +40,8 @@ import javax.inject.Inject;
  * @author Olivier Lamy
  */
 @Service("archivaEntityManagerFactory#cassandra")
-public class DefaultArchivaCassandraEntityManagerFactory
-    implements ArchivaCassandraEntityManagerFactory
+public class DefaultCassandraEntityManagerFactory
+    implements CassandraEntityManagerFactory
 {
 
     @Inject

Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1483333&r1=1483332&r2=1483333&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java Thu May 16 13:00:22 2013
@@ -39,7 +39,7 @@ public class CassandraMetadataRepository
 
     @Inject
     @Named( value = "archivaEntityManagerFactory#cassandra" )
-    ArchivaCassandraEntityManagerFactory archivaCassandraEntityManagerFactory;
+    CassandraEntityManagerFactory cassandraEntityManagerFactory;
 
     @Before
     public void setUp()
@@ -53,6 +53,6 @@ public class CassandraMetadataRepository
             FileUtils.deleteDirectory( directory );
         }
 
-        this.repository = new CassandraMetadataRepository( null, null, archivaCassandraEntityManagerFactory.getKeyspace() );
+        this.repository = new CassandraMetadataRepository( null, null, cassandraEntityManagerFactory.getKeyspace() );
     }
 }

Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1483333&r1=1483332&r2=1483333&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java Thu May 16 13:00:22 2013
@@ -46,7 +46,7 @@ public class RepositoriesNamespaceTest
 
     @Inject
     @Named( value = "archivaEntityManagerFactory#cassandra" )
-    ArchivaCassandraEntityManagerFactory archivaCassandraEntityManagerFactory;
+    CassandraEntityManagerFactory cassandraEntityManagerFactory;
 
 
     CassandraMetadataRepository cmr;
@@ -56,7 +56,7 @@ public class RepositoriesNamespaceTest
         throws Exception
     {
 
-        cmr = new CassandraMetadataRepository( null, null, archivaCassandraEntityManagerFactory.getKeyspace() );
+        cmr = new CassandraMetadataRepository( null, null, cassandraEntityManagerFactory.getKeyspace() );
 
     }