Author: olamy
Date: Thu May 16 12:58:30 2013
New Revision: 1483332
URL: http://svn.apache.org/r1483332
Log:
fix naming
Added:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java
- copied, changed from r1483331,
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaEntityManagerFactory.java
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java
- copied, changed from r1483331,
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaEntityManagerFactory.java
Removed:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaEntityManagerFactory.java
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaEntityManagerFactory.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/ArchivaCassandraEntityManagerFactory.java
(from r1483331,
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaEntityManagerFactory.java)
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java?p2=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java&p1=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaEntityManagerFactory.java&r1=1483331&r2=1483332&rev=1483332&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaEntityManagerFactory.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ArchivaCassandraEntityManagerFactory.java
Thu May 16 12:58:30 2013
@@ -24,7 +24,7 @@ import com.netflix.astyanax.Keyspace;
/**
* @author Olivier Lamy
*/
-public interface ArchivaEntityManagerFactory
+public interface ArchivaCassandraEntityManagerFactory
{
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=1483332&r1=1483331&r2=1483332&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 12:58:30 2013
@@ -55,7 +55,7 @@ public class CassandraRepositorySessionF
private ApplicationContext applicationContext;
@Inject
- private ArchivaEntityManagerFactory archivaEntityManagerFactory;
+ private ArchivaCassandraEntityManagerFactory
archivaCassandraEntityManagerFactory;
@PostConstruct
public void initialize()
@@ -80,7 +80,7 @@ public class CassandraRepositorySessionF
{
CassandraMetadataRepository metadataRepository =
new CassandraMetadataRepository( metadataFacetFactories,
configuration,
-
archivaEntityManagerFactory.getKeyspace() );
+
archivaCassandraEntityManagerFactory.getKeyspace() );
return new RepositorySession( metadataRepository, metadataResolver );
}
Copied:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java
(from r1483331,
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaEntityManagerFactory.java)
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java?p2=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java&p1=archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaEntityManagerFactory.java&r1=1483331&r2=1483332&rev=1483332&view=diff
==============================================================================
---
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaEntityManagerFactory.java
(original)
+++
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultArchivaCassandraEntityManagerFactory.java
Thu May 16 12:58:30 2013
@@ -40,8 +40,8 @@ import javax.inject.Inject;
* @author Olivier Lamy
*/
@Service("archivaEntityManagerFactory#cassandra")
-public class DefaultArchivaEntityManagerFactory
- implements ArchivaEntityManagerFactory
+public class DefaultArchivaCassandraEntityManagerFactory
+ implements ArchivaCassandraEntityManagerFactory
{
@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=1483332&r1=1483331&r2=1483332&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 12:58:30 2013
@@ -39,7 +39,7 @@ public class CassandraMetadataRepository
@Inject
@Named( value = "archivaEntityManagerFactory#cassandra" )
- ArchivaEntityManagerFactory archivaEntityManagerFactory;
+ ArchivaCassandraEntityManagerFactory archivaCassandraEntityManagerFactory;
@Before
public void setUp()
@@ -53,6 +53,6 @@ public class CassandraMetadataRepository
FileUtils.deleteDirectory( directory );
}
- this.repository = new CassandraMetadataRepository( null, null,
archivaEntityManagerFactory.getKeyspace() );
+ this.repository = new CassandraMetadataRepository( null, null,
archivaCassandraEntityManagerFactory.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=1483332&r1=1483331&r2=1483332&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 12:58:30 2013
@@ -46,7 +46,7 @@ public class RepositoriesNamespaceTest
@Inject
@Named( value = "archivaEntityManagerFactory#cassandra" )
- ArchivaEntityManagerFactory archivaEntityManagerFactory;
+ ArchivaCassandraEntityManagerFactory archivaCassandraEntityManagerFactory;
CassandraMetadataRepository cmr;
@@ -56,7 +56,7 @@ public class RepositoriesNamespaceTest
throws Exception
{
- cmr = new CassandraMetadataRepository( null, null,
archivaEntityManagerFactory.getKeyspace() );
+ cmr = new CassandraMetadataRepository( null, null,
archivaCassandraEntityManagerFactory.getKeyspace() );
}
