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=0d734335bce506fc0aff79ff2e295efd41287a6b;hpb=8bc47c1403b47e1e35413ead26a606195c21549e;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 0d734335b..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 @@ -38,10 +38,10 @@ 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; @@ -59,6 +59,7 @@ 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; private String parentPomCoordinates; @@ -66,8 +67,9 @@ public class NormalizeGroup implements Runnable, SlcNames { 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(); @@ -95,51 +97,81 @@ public class NormalizeGroup implements Runnable, SlcNames { } } - public synchronized void processGroupNode(Node groupNode, String version, - ArgeoMonitor monitor) throws RepositoryException { - // FIXME better encapsulate - groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID).getString(); - this.version = version; - processGroupNode(groupNode, monitor); + 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(); - for (NodeIterator artifactBases = groupNode.getNodes(); artifactBases + aBases: for (NodeIterator aBases = groupNode.getNodes(); aBases .hasNext();) { - Node artifactBase = artifactBases.nextNode(); - if (artifactBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { - for (NodeIterator artifactVersions = artifactBase.getNodes(); artifactVersions + Node aBase = aBases.nextNode(); + if (aBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { + Node highestAVersion = null; + for (NodeIterator aVersions = aBase.getNodes(); aVersions .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()); + 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()); - // } + + // 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()) @@ -169,6 +201,14 @@ public class NormalizeGroup implements Runnable, SlcNames { 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, Set artifacts) throws RepositoryException { Artifact artifact = new DefaultArtifact(groupId, artifactId, "pom", @@ -181,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) { @@ -233,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, @@ -400,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; + } }