From c82a0e6bc1c0d9c54f6147bf06a8d831c9eaa92e Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 21 Dec 2010 09:30:25 +0000 Subject: [PATCH] [MRM-1327] remove unnecessary facet node for artifacts git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051429 13f79535-47bb-0310-9956-ffa450edef68 --- .../repository/jcr/JcrMetadataRepository.java | 59 +++++++++++-------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java index d3aabfc73..7a8506cea 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java @@ -78,6 +78,12 @@ import javax.jcr.query.QueryResult; public class JcrMetadataRepository implements MetadataRepository { + private static final String ARTIFACT_FACET_NODE_TYPE = "archiva:artifactFacet"; + + private static final String JCR_LAST_MODIFIED = "jcr:lastModified"; + + private static final String ARTIFACT_NODE_TYPE = "archiva:artifact"; + /** * @plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory" */ @@ -104,13 +110,11 @@ public class JcrMetadataRepository session = repository.login( new SimpleCredentials( "username", "password".toCharArray() ) ); Workspace workspace = session.getWorkspace(); - workspace.getNamespaceRegistry().registerNamespace( "archiva", "http://archiva.apache.org/jcr" ); + workspace.getNamespaceRegistry().registerNamespace( "archiva", "http://archiva.apache.org/jcr/" ); NodeTypeManager nodeTypeManager = workspace.getNodeTypeManager(); - NodeTypeTemplate nodeType = nodeTypeManager.createNodeTypeTemplate(); - nodeType.setMixin( true ); - nodeType.setName( "archiva:artifact" ); - nodeTypeManager.registerNodeType( nodeType, false ); + registerMixinNodeType( nodeTypeManager, ARTIFACT_NODE_TYPE ); + registerMixinNodeType( nodeTypeManager, ARTIFACT_FACET_NODE_TYPE ); } catch ( LoginException e ) { @@ -124,6 +128,15 @@ public class JcrMetadataRepository } } + private static void registerMixinNodeType( NodeTypeManager nodeTypeManager, String name ) + throws RepositoryException + { + NodeTypeTemplate nodeType = nodeTypeManager.createNodeTypeTemplate(); + nodeType.setMixin( true ); + nodeType.setName( name ); + nodeTypeManager.registerNodeType( nodeType, false ); + } + public void updateProject( String repositoryId, ProjectMetadata project ) { updateProject( repositoryId, project.getNamespace(), project.getId() ); @@ -156,7 +169,7 @@ public class JcrMetadataRepository Calendar cal = Calendar.getInstance(); cal.setTime( artifactMeta.getFileLastModified() ); - node.setProperty( "jcr:lastModified", cal ); + node.setProperty( JCR_LAST_MODIFIED, cal ); cal = Calendar.getInstance(); cal.setTime( artifactMeta.getWhenGathered() ); @@ -168,18 +181,18 @@ public class JcrMetadataRepository node.setProperty( "version", artifactMeta.getVersion() ); - // TODO: namespaced properties instead? - Node facetNode = JcrUtils.getOrAddNode( node, "facets" ); for ( MetadataFacet facet : artifactMeta.getFacetList() ) { // TODO: need to clear it? - Node n = JcrUtils.getOrAddNode( facetNode, facet.getFacetId() ); + Node n = JcrUtils.getOrAddNode( node, facet.getFacetId() ); + n.addMixin( ARTIFACT_FACET_NODE_TYPE ); for ( Map.Entry entry : facet.toProperties().entrySet() ) { n.setProperty( entry.getKey(), entry.getValue() ); } } + // TODO: need some context around this so it can be done only when needed session.save(); } catch ( RepositoryException e ) @@ -1104,9 +1117,9 @@ public class JcrMetadataRepository ? artifactNode.getProperty( "version" ).getString() : projectVersionNode.getName() ); - if ( artifactNode.hasProperty( "jcr:lastModified" ) ) + if ( artifactNode.hasProperty( JCR_LAST_MODIFIED ) ) { - artifact.setFileLastModified( artifactNode.getProperty( "jcr:lastModified" ).getDate().getTimeInMillis() ); + artifact.setFileLastModified( artifactNode.getProperty( JCR_LAST_MODIFIED ).getDate().getTimeInMillis() ); } if ( artifactNode.hasProperty( "whenGathered" ) ) @@ -1129,29 +1142,27 @@ public class JcrMetadataRepository artifact.setSha1( artifactNode.getProperty( "sha1" ).getString() ); } - if ( artifactNode.hasNode( "facets" ) ) + for ( Node n : JcrUtils.getChildNodes( artifactNode ) ) { - NodeIterator j = artifactNode.getNode( "facets" ).getNodes(); - - while ( j.hasNext() ) + if ( n.isNodeType( ARTIFACT_FACET_NODE_TYPE ) ) { - Node facetNode = j.nextNode(); - - MetadataFacetFactory factory = metadataFacetFactories.get( facetNode.getName() ); + String name = n.getName(); + MetadataFacetFactory factory = metadataFacetFactories.get( name ); if ( factory == null ) { - log.error( "Attempted to load unknown project version metadata facet: " + facetNode.getName() ); + log.error( "Attempted to load unknown project version metadata facet: " + name ); } else { MetadataFacet facet = factory.createMetadataFacet(); Map map = new HashMap(); - PropertyIterator i = facetNode.getProperties(); - while ( i.hasNext() ) + for ( Property p : JcrUtils.getProperties( n ) ) { - Property p = i.nextProperty(); String property = p.getName(); - map.put( property, p.getString() ); + if ( !property.startsWith( "jcr:" ) ) + { + map.put( property, p.getString() ); + } } facet.fromProperties( map ); artifact.addFacet( facet ); @@ -1243,7 +1254,7 @@ public class JcrMetadataRepository { Node versionNode = getOrAddProjectVersionNode( repositoryId, namespace, projectId, projectVersion ); Node node = JcrUtils.getOrAddNode( versionNode, id ); - node.addMixin( "archiva:artifact" ); + node.addMixin( ARTIFACT_NODE_TYPE ); return node; } -- 2.39.5