svn commit: r1053780 - in /archiva/trunk/archiva-modules: metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/ plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/

[brett]

Author: brett
Date: Thu Dec 30 01:29:50 2010
New Revision: 1053780

URL: http://svn.apache.org/viewvc?rev=1053780&view=rev
Log:
[MRM-1327] make sure getArtifacts query is restricted to the right repository

Modified:
    
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
    
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java

Modified: 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1053780&r1=1053779&r2=1053780&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
 Thu Dec 30 01:29:50 2010
@@ -812,6 +812,21 @@ public abstract class AbstractMetadataRe
         assertEquals( Collections.singletonList( artifact ), 
repository.getArtifacts( TEST_REPO_ID ) );
     }
 
+    public void testGetArtifactsByRepoIdMultipleCopies()
+        throws Exception
+    {
+        ArtifactMetadata artifact = createArtifact();
+        repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, 
TEST_PROJECT_VERSION, artifact );
+
+        ArtifactMetadata secondArtifact = createArtifact();
+        secondArtifact.setRepositoryId( OTHER_REPO_ID );
+        repository.updateArtifact( OTHER_REPO_ID, TEST_NAMESPACE, 
TEST_PROJECT, TEST_PROJECT_VERSION, secondArtifact );
+
+        // test it restricts to the appropriate repository
+        assertEquals( Collections.singletonList( artifact ), 
repository.getArtifacts( TEST_REPO_ID ) );
+        assertEquals( Collections.singletonList( secondArtifact ), 
repository.getArtifacts( OTHER_REPO_ID ) );
+    }
+
     public void testGetNamespacesWithSparseDepth()
         throws Exception
     {

Modified: 
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java?rev=1053780&r1=1053779&r2=1053780&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
 Thu Dec 30 01:29:50 2010
@@ -79,7 +79,7 @@ public class JcrMetadataRepository
 
     static final String FACET_NODE_TYPE = "archiva:facet";
 
-    private static final String QUERY_ARTIFACTS = "SELECT * FROM [" + 
ARTIFACT_NODE_TYPE + "]";
+    private static final String QUERY_ARTIFACTS = "SELECT * FROM [" + 
ARTIFACT_NODE_TYPE + "] AS artifact";
 
     private final Map<String, MetadataFacetFactory> metadataFacetFactories;
 
@@ -630,7 +630,8 @@ public class JcrMetadataRepository
     {
         List<ArtifactMetadata> artifacts;
 
-        String q = QUERY_ARTIFACTS;
+        String q = QUERY_ARTIFACTS + " WHERE ISDESCENDANTNODE(artifact,'/" + 
getRepositoryContentPath( repositoryId ) +
+            "')";
 
         try
         {