X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FNormalizeGroup.java;h=bc228285a0b88ad633a93c8a6993cf20075895a1;hb=e70fb767d8ff5972d88ab436762e71ea622a0f72;hp=c6c1e4a721f806577bd5bfaa62d3c79c10df5f85;hpb=cc564c929347611e43d731cac688b272d0b6c17e;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java index c6c1e4a72..bc228285a 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2012 Mathieu Baudier + * Copyright (C) 2007-2012 Argeo GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,16 +31,17 @@ import javax.jcr.Session; import org.apache.commons.io.FilenameUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.ArgeoMonitor; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.aether.ArtifactIdComparator; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.ArtifactIndexer; -import org.argeo.slc.repo.JarFileIndexer; import org.argeo.slc.repo.RepoUtils; import org.argeo.slc.repo.maven.MavenConventionsUtils; import org.osgi.framework.Constants; +import org.osgi.framework.Version; import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.util.artifact.DefaultArtifact; @@ -58,15 +59,17 @@ public class NormalizeGroup implements Runnable, SlcNames { private Repository repository; private String workspace; private String groupId; + private Boolean overridePoms = false; private String artifactBasePath = "/"; - private String version = null;// = "1.3.0"; - private String parentPomCoordinates;// = "org.argeo:parent:1.3.0"; + private String version = null; + private String parentPomCoordinates; private List excludedSuffixes = new ArrayList(); private ArtifactIndexer artifactIndexer = new ArtifactIndexer(); - private JarFileIndexer jarFileIndexer = new JarFileIndexer(); + // private JarFileIndexer jarFileIndexer = new JarFileIndexer(); + /** TODO make it more generic */ private List systemPackages = OsgiProfile.PROFILE_JAVA_SE_1_6 .getSystemPackages(); @@ -83,74 +86,127 @@ public class NormalizeGroup implements Runnable, SlcNames { Session session = null; try { session = repository.login(workspace); - Node groupNode = session.getNode(MavenConventionsUtils.groupPath( artifactBasePath, groupId)); - // TODO factorize with a traverser pattern? - for (NodeIterator artifactBases = groupNode.getNodes(); artifactBases - .hasNext();) { - Node artifactBase = artifactBases.nextNode(); - if (artifactBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { - for (NodeIterator artifactVersions = artifactBase - .getNodes(); artifactVersions.hasNext();) { - Node artifactVersion = artifactVersions.nextNode(); - if (artifactVersion - .isNodeType(SlcTypes.SLC_ARTIFACT_VERSION_BASE)) - for (NodeIterator files = artifactVersion - .getNodes(); files.hasNext();) { - Node file = files.nextNode(); - if (file.isNodeType(SlcTypes.SLC_BUNDLE_ARTIFACT)) { - preProcessBundleArtifact(file); - file.getSession().save(); - if (log.isDebugEnabled()) - log.debug("Pre-processed " - + file.getName()); - } + processGroupNode(groupNode, null); + } catch (Exception e) { + throw new SlcException("Cannot normalize group " + groupId + " in " + + workspace, e); + } finally { + JcrUtils.logoutQuietly(session); + } + } + + public static void processGroupNode(Node groupNode, String version, + Boolean overridePoms, ArgeoMonitor monitor) + throws RepositoryException { + // TODO set artifactsBase based on group node + NormalizeGroup ng = new NormalizeGroup(); + String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID) + .getString(); + ng.setGroupId(groupId); + ng.setVersion(version); + ng.setOverridePoms(overridePoms); + ng.processGroupNode(groupNode, monitor); + } + protected void processGroupNode(Node groupNode, ArgeoMonitor monitor) + throws RepositoryException { + if (monitor != null) + monitor.subTask("Group " + groupId); + Node allArtifactsHighestVersion = null; + Session session = groupNode.getSession(); + aBases: for (NodeIterator aBases = groupNode.getNodes(); aBases + .hasNext();) { + Node aBase = aBases.nextNode(); + if (aBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { + Node highestAVersion = null; + for (NodeIterator aVersions = aBase.getNodes(); aVersions + .hasNext();) { + Node aVersion = aVersions.nextNode(); + if (aVersion.isNodeType(SlcTypes.SLC_ARTIFACT_VERSION_BASE)) { + if (highestAVersion == null) { + highestAVersion = aVersion; + if (allArtifactsHighestVersion == null) + allArtifactsHighestVersion = aVersion; + + } else { + Version currVersion = extractOsgiVersion(aVersion); + Version currentHighestVersion = extractOsgiVersion(highestAVersion); + if (currVersion.compareTo(currentHighestVersion) > 0) { + highestAVersion = aVersion; + } + if (currVersion + .compareTo(extractOsgiVersion(allArtifactsHighestVersion)) > 0) { + allArtifactsHighestVersion = aVersion; } + } + } + + } + if (highestAVersion == null) + continue aBases; + for (NodeIterator files = highestAVersion.getNodes(); files + .hasNext();) { + Node file = files.nextNode(); + if (file.isNodeType(SlcTypes.SLC_BUNDLE_ARTIFACT)) { + preProcessBundleArtifact(file); + file.getSession().save(); + if (log.isDebugEnabled()) + log.debug("Pre-processed " + file.getName()); + } + } } - // NodeIterator bundlesIt = listBundleArtifacts(session); - // - // while (bundlesIt.hasNext()) { - // Node bundleNode = bundlesIt.nextNode(); - // preProcessBundleArtifact(bundleNode); - // bundleNode.getSession().save(); - // if (log.isDebugEnabled()) - // log.debug("Pre-processed " + bundleNode.getName()); - // } - - int bundleCount = symbolicNamesToNodes.size(); - if (log.isDebugEnabled()) - log.debug("Indexed " + bundleCount + " bundles"); - - int count = 1; - for (Node bundleNode : symbolicNamesToNodes.values()) { - processBundleArtifact(bundleNode); - bundleNode.getSession().save(); - if (log.isDebugEnabled()) - log.debug(count + "/" + bundleCount + " Processed " - + bundleNode.getName()); - count++; - } + } - // indexes - Set indexes = new TreeSet( - new ArtifactIdComparator()); - Artifact indexArtifact = writeIndex(session, BINARIES_ARTIFACT_ID, - binaries); - indexes.add(indexArtifact); - indexArtifact = writeIndex(session, SOURCES_ARTIFACT_ID, sources); - indexes.add(indexArtifact); - // sdk - writeIndex(session, SDK_ARTIFACT_ID, indexes); - } catch (Exception e) { - throw new SlcException("Cannot normalize group " + groupId + " in " - + workspace, e); - } finally { - JcrUtils.logoutQuietly(session); + // if version not set or empty, use the highets version + // useful when indexing a product maven repository where + // all artifacts have the same version for a given release + // => the version can then be left empty + if (version == null || version.trim().equals("")) + if (allArtifactsHighestVersion != null) + version = allArtifactsHighestVersion.getProperty( + SLC_ARTIFACT_VERSION).getString(); + else + throw new SlcException("Group version " + version + + " is empty."); + + int bundleCount = symbolicNamesToNodes.size(); + if (log.isDebugEnabled()) + log.debug("Indexed " + bundleCount + " bundles"); + + int count = 1; + for (Node bundleNode : symbolicNamesToNodes.values()) { + processBundleArtifact(bundleNode); + bundleNode.getSession().save(); + if (log.isDebugEnabled()) + log.debug(count + "/" + bundleCount + " Processed " + + bundleNode.getName()); + count++; } + + // indexes + Set indexes = new TreeSet( + new ArtifactIdComparator()); + Artifact indexArtifact = writeIndex(session, BINARIES_ARTIFACT_ID, + binaries); + indexes.add(indexArtifact); + indexArtifact = writeIndex(session, SOURCES_ARTIFACT_ID, sources); + indexes.add(indexArtifact); + // sdk + writeIndex(session, SDK_ARTIFACT_ID, indexes); + if (monitor != null) + monitor.worked(1); + } + + private Version extractOsgiVersion(Node artifactVersion) + throws RepositoryException { + String rawVersion = artifactVersion.getProperty(SLC_ARTIFACT_VERSION) + .getString(); + String cleanVersion = rawVersion.replace("-SNAPSHOT", ".SNAPSHOT"); + return new Version(cleanVersion); } private Artifact writeIndex(Session session, String artifactId, @@ -165,23 +221,27 @@ public class NormalizeGroup implements Runnable, SlcNames { session.getNode(artifactBasePath), artifact, pom.getBytes()); artifactIndexer.index(node); - // FIXME factorize + // TODO factorize String pomSha = JcrUtils.checksumFile(node, "SHA-1"); JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".sha1", pomSha.getBytes()); + String pomMd5 = JcrUtils.checksumFile(node, "MD5"); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".md5", + pomMd5.getBytes()); session.save(); return artifact; } protected void preProcessBundleArtifact(Node bundleNode) throws RepositoryException { - artifactIndexer.index(bundleNode); - jarFileIndexer.index(bundleNode); + // we assume nodes are already indexed + // artifactIndexer.index(bundleNode); + // jarFileIndexer.index(bundleNode); String symbolicName = JcrUtils.get(bundleNode, SLC_SYMBOLIC_NAME); if (symbolicName.endsWith(".source")) { - // TODO make a shared node with classifier 'sources' + // TODO make a shared node with classifier 'sources'? String bundleName = RepoUtils .extractBundleNameFromSourceName(symbolicName); for (String excludedSuffix : excludedSuffixes) { @@ -206,8 +266,8 @@ public class NormalizeGroup implements Runnable, SlcNames { return;// skip adding to binaries } binaries.add(RepoUtils.asArtifact(bundleNode)); - - if(bundleNode.getSession().hasPendingChanges()) + + if (bundleNode.getSession().hasPendingChanges()) bundleNode.getSession().save(); } @@ -217,11 +277,13 @@ public class NormalizeGroup implements Runnable, SlcNames { String baseName = FilenameUtils.getBaseName(bundleNode.getName()); // pom - String pom = generatePomForBundle(bundleNode); String pomName = baseName + ".pom"; + if (artifactFolder.hasNode(pomName) && !overridePoms) + return;// skip + + String pom = generatePomForBundle(bundleNode); Node pomNode = JcrUtils.copyBytesAsFile(artifactFolder, pomName, pom.getBytes()); - // checksum String bundleSha = JcrUtils.checksumFile(bundleNode, "SHA-1"); JcrUtils.copyBytesAsFile(artifactFolder, @@ -384,4 +446,11 @@ public class NormalizeGroup implements Runnable, SlcNames { this.excludedSuffixes = excludedSuffixes; } + public void setOverridePoms(Boolean overridePoms) { + this.overridePoms = overridePoms; + } + + public void setArtifactIndexer(ArtifactIndexer artifactIndexer) { + this.artifactIndexer = artifactIndexer; + } }