svn commit: r1484274 - in /archiva/sandbox/trunk/metadata-store-cassandra/src: main/java/org/apache/archiva/metadata/repository/cassandra/ test/java/org/apache/archiva/metadata/repository/cassandra/

[olamy]

Author: olamy
Date: Sun May 19 11:55:09 2013
New Revision: 1484274

URL: http://svn.apache.org/r1484274
Log:
fix searching namespaces

Modified:
    
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.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

Modified: 
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: 
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1484274&r1=1484273&r2=1484274&view=diff
==============================================================================
--- 
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
 (original)
+++ 
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
 Sun May 19 11:55:09 2013
@@ -119,6 +119,16 @@ public class CassandraMetadataRepository
         return namespaceEntityManager;
     }
 
+    public void setRepositoryEntityManager( EntityManager<Repository, String> 
repositoryEntityManager )
+    {
+        this.repositoryEntityManager = repositoryEntityManager;
+    }
+
+    public void setNamespaceEntityManager( EntityManager<Namespace, String> 
namespaceEntityManager )
+    {
+        this.namespaceEntityManager = namespaceEntityManager;
+    }
+
     @Override
     public void updateNamespace( String repositoryId, String namespaceId )
         throws MetadataRepositoryException
@@ -133,6 +143,7 @@ public class CassandraMetadataRepository
             //namespace.setRepository( repository );
             //repository.getNamespaces().add( namespace );
             this.repositoryEntityManager.put( repository );
+
             this.namespaceEntityManager.put( namespace );
         }
         // FIXME add a Namespace id builder
@@ -219,6 +230,11 @@ public class CassandraMetadataRepository
 
         List<String> namespaceNames = new ArrayList<String>( namespaces.size() 
);
 
+        for ( Namespace namespace : namespaces )
+        {
+            namespaceNames.add( namespace.getName() );
+        }
+
         return namespaceNames;
     }
 
@@ -248,6 +264,11 @@ public class CassandraMetadataRepository
 
         List<String> namespaceNames = new ArrayList<String>( namespaces.size() 
);
 
+        for ( Namespace namespace : namespaces )
+        {
+            namespaceNames.add( namespace.getName() );
+        }
+
         return namespaceNames;
 
     }

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=1484274&r1=1484273&r2=1484274&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
 Sun May 19 11:55:09 2013
@@ -21,6 +21,7 @@ package org.apache.archiva.metadata.repo
 
 import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
 import org.apache.commons.io.FileUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,4 +56,13 @@ public class CassandraMetadataRepository
 
         this.repository = new CassandraMetadataRepository( null, null, 
cassandraEntityManagerFactory.getKeyspace() );
     }
+
+
+    @After
+    public void shutdown()
+        throws Exception
+    {
+        //cassandraEntityManagerFactory.getKeyspace().dr .dropKeyspace();
+    }
+
 }

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=1484274&r1=1484273&r2=1484274&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
 Sun May 19 11:55:09 2013
@@ -64,8 +64,7 @@ public class RepositoriesNamespaceTest
     public void shutdown()
         throws Exception
     {
-        //em.close();
-        //emf.close();
+
     }