Author: brett
Date: Tue Mar 29 12:42:47 2011
New Revision: 1086569
URL: http://svn.apache.org/viewvc?rev=1086569&view=rev
Log:
[MRM-1327] fix 'used by' to work under JCR store. Remove
updateProjectReferences API
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.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/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Tue Mar 29 12:42:47 2011
@@ -94,12 +94,6 @@ public class TestMetadataRepository
//To change body of implemented methods use File | Settings | File
Templates.
}
- public void updateProjectReference( String repoId, String namespace,
String projectId, String projectVersion,
- ProjectVersionReference reference )
- {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
-
public void updateNamespace( String repoId, String namespace )
{
//To change body of implemented methods use File | Settings | File
Templates.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
Tue Mar 29 12:42:47 2011
@@ -195,12 +195,6 @@ public class NewArtifactsRssFeedProcesso
throw new UnsupportedOperationException();
}
- public void updateProjectReference( String arg0, String arg1, String
arg2, String arg3,
- ProjectVersionReference arg4 )
- {
- throw new UnsupportedOperationException();
- }
-
public void updateProjectVersion( String arg0, String arg1, String
arg2, ProjectVersionMetadata arg3 )
{
throw new UnsupportedOperationException();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java
Tue Mar 29 12:42:47 2011
@@ -133,12 +133,6 @@ public class TestMetadataRepository
throw new UnsupportedOperationException();
}
- public void updateProjectReference( String repoId, String namespace,
String projectId, String projectVersion,
- ProjectVersionReference reference )
- {
- throw new UnsupportedOperationException();
- }
-
public void updateNamespace( String repoId, String namespace )
{
throw new UnsupportedOperationException();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Tue Mar 29 12:42:47 2011
@@ -94,12 +94,6 @@ public class TestMetadataRepository
//To change body of implemented methods use File | Settings | File
Templates.
}
- public void updateProjectReference( String repoId, String namespace,
String projectId, String projectVersion,
- ProjectVersionReference reference )
- {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
-
public void updateNamespace( String repoId, String namespace )
{
//To change body of implemented methods use File | Settings | File
Templates.
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
Tue Mar 29 12:42:47 2011
@@ -20,7 +20,6 @@ package org.apache.archiva.metadata.repo
*/
import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.metadata.model.Dependency;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.model.ProjectVersionReference;
@@ -108,19 +107,6 @@ public class DefaultMetadataResolver
ref.setProjectId( projectId );
ref.setProjectVersion( projectVersion );
ref.setReferenceType(
ProjectVersionReference.ReferenceType.DEPENDENCY );
- for ( Dependency dependency : metadata.getDependencies() )
- {
- try
- {
- metadataRepository.updateProjectReference( repoId,
dependency.getGroupId(),
-
dependency.getArtifactId(),
-
dependency.getVersion(), ref );
- }
- catch ( MetadataRepositoryException e )
- {
- log.warn( "Unable to persist resolved information:
" + e.getMessage(), e );
- }
- }
}
try
{
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
Tue Mar 29 12:42:47 2011
@@ -48,10 +48,6 @@ public interface MetadataRepository
ProjectVersionMetadata versionMetadata )
throws MetadataRepositoryException;
- void updateProjectReference( String repositoryId, String namespace, String
projectId, String projectVersion,
- ProjectVersionReference reference )
- throws MetadataRepositoryException;
-
void updateNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException;
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
Tue Mar 29 12:42:47 2011
@@ -54,12 +54,6 @@ public class TestMetadataRepository
//To change body of implemented methods use File | Settings | File
Templates.
}
- public void updateProjectReference( String repoId, String namespace,
String projectId, String projectVersion,
- ProjectVersionReference reference )
- {
- //To change body of implemented methods use File | Settings | File
Templates.
- }
-
public void updateNamespace( String repoId, String namespace )
{
//To change body of implemented methods use File | Settings | File
Templates.
Modified:
archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=1086569&r1=1086568&r2=1086569&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Tue Mar 29 12:42:47 2011
@@ -188,6 +188,11 @@ public class FileMetadataRepository
i++;
}
i = 0;
+ ProjectVersionReference reference = new ProjectVersionReference();
+ reference.setNamespace( namespace );
+ reference.setProjectId( projectId );
+ reference.setProjectVersion( versionMetadata.getId() );
+ reference.setReferenceType(
ProjectVersionReference.ReferenceType.DEPENDENCY );
for ( Dependency dependency : versionMetadata.getDependencies() )
{
setProperty( properties, "dependency." + i + ".classifier",
dependency.getClassifier() );
@@ -198,6 +203,10 @@ public class FileMetadataRepository
setProperty( properties, "dependency." + i + ".version",
dependency.getVersion() );
setProperty( properties, "dependency." + i + ".type",
dependency.getType() );
setProperty( properties, "dependency." + i + ".optional",
String.valueOf( dependency.isOptional() ) );
+
+ updateProjectReference( repoId, dependency.getGroupId(),
dependency.getArtifactId(),
+ dependency.getVersion(), reference );
+
i++;
}
Set<String> facetIds = new LinkedHashSet<String>(
versionMetadata.getFacetIds() );
@@ -250,8 +259,8 @@ public class FileMetadataRepository
}
}
- public void updateProjectReference( String repoId, String namespace,
String projectId, String projectVersion,
- ProjectVersionReference reference )
+ private void updateProjectReference( String repoId, String namespace,
String projectId, String projectVersion,
+ ProjectVersionReference reference )
{
File directory = new File( getDirectory( repoId ), namespace + "/" +
projectId + "/" + projectVersion );
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=1086569&r1=1086568&r2=1086569&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
Tue Mar 29 12:42:47 2011
@@ -345,30 +345,6 @@ public class JcrMetadataRepository
}
}
- // FIXME: remove this and projectversionreference
- public void updateProjectReference( String repositoryId, String namespace,
String projectId, String projectVersion,
- ProjectVersionReference reference )
- throws MetadataRepositoryException
- {
- // not using weak references, since they still need to exist upfront
to be referred to
- try
- {
- Node node = getOrAddRepositoryContentNode( repositoryId );
- node = JcrUtils.getOrAddNode( node, namespace );
- node = JcrUtils.getOrAddNode( node, projectId );
- node = JcrUtils.getOrAddNode( node, projectVersion );
- node = JcrUtils.getOrAddNode( node, "references" );
- node = JcrUtils.getOrAddNode( node, reference.getNamespace() );
- node = JcrUtils.getOrAddNode( node, reference.getProjectId() );
- node = JcrUtils.getOrAddNode( node, reference.getProjectVersion()
);
- node.setProperty( "type", reference.getReferenceType().toString()
);
- }
- catch ( RepositoryException e )
- {
- throw new MetadataRepositoryException( e.getMessage(), e );
- }
- }
-
public void updateNamespace( String repositoryId, String namespace )
throws MetadataRepositoryException
{
