X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2FRepoUtils.java;h=a8c9cca23f8d8451dc816fca376e1262642d4e32;hb=2e4bfefab7c8a266fe1ab75180fee6b3a3a48fb5;hp=fe833bc0750b6c12fed855867e4dbec282fca0da;hpb=58e0e18d64a2080680a9f8397b0dfa2894519910;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java index fe833bc07..a8c9cca23 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java @@ -23,7 +23,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Enumeration; import java.util.Iterator; +import java.util.Set; import java.util.StringTokenizer; +import java.util.TreeSet; import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -40,6 +42,7 @@ import javax.jcr.PropertyIterator; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; +import javax.jcr.Session; import javax.jcr.SimpleCredentials; import javax.jcr.nodetype.NodeType; @@ -51,9 +54,10 @@ import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrUtils; -import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; 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.maven.MavenConventionsUtils; @@ -237,15 +241,28 @@ public class RepoUtils implements ArgeoNames, SlcNames { /** Read the OSGi {@link NameVersion} */ public static NameVersion readNameVersion(File artifactFile) { + try { + return readNameVersion(new FileInputStream(artifactFile)); + } catch (Exception e) { + // probably not a jar, skipping + if (log.isDebugEnabled()) { + log.debug("Skipping " + artifactFile + " because of " + e); + // e.printStackTrace(); + } + } + return null; + } + + /** Read the OSGi {@link NameVersion} */ + public static NameVersion readNameVersion(InputStream in) { JarInputStream jarInputStream = null; try { - jarInputStream = new JarInputStream(new FileInputStream( - artifactFile)); + jarInputStream = new JarInputStream(in); return readNameVersion(jarInputStream.getManifest()); } catch (Exception e) { // probably not a jar, skipping if (log.isDebugEnabled()) { - log.debug("Skipping " + artifactFile + " because of " + e); + log.debug("Skipping because of " + e); // e.printStackTrace(); } } finally { @@ -256,7 +273,7 @@ public class RepoUtils implements ArgeoNames, SlcNames { /** Read the OSGi {@link NameVersion} */ public static NameVersion readNameVersion(Manifest manifest) { - BasicNameVersion nameVersion = new BasicNameVersion(); + DefaultNameVersion nameVersion = new DefaultNameVersion(); nameVersion.setName(manifest.getMainAttributes().getValue( Constants.BUNDLE_SYMBOLICNAME)); @@ -298,6 +315,22 @@ public class RepoUtils implements ArgeoNames, SlcNames { } } + /** + * The path to the PDE source related to this artifact (or artifact version + * base). There may or there may not be a node at this location (the + * returned path will typically be used to test whether PDE sources are + * attached to this artifact). + */ + public static String relatedPdeSourcePath(String artifactBasePath, + Node artifactNode) throws RepositoryException { + Artifact artifact = asArtifact(artifactNode); + Artifact pdeSourceArtifact = new DefaultArtifact(artifact.getGroupId(), + artifact.getArtifactId() + ".source", artifact.getExtension(), + artifact.getVersion()); + return MavenConventionsUtils.artifactPath(artifactBasePath, + pdeSourceArtifact); + } + /** * Copy this bytes array as an artifact, relative to the root of the * repository (typically the workspace root node) @@ -352,7 +385,6 @@ public class RepoUtils implements ArgeoNames, SlcNames { throw new SlcException("Cannot connect to repository " + repoNode, e); } - } /** @@ -384,6 +416,61 @@ public class RepoUtils implements ArgeoNames, SlcNames { } } + /** + * Write group indexes: 'binaries' lists all bundles and their versions, + * 'sources' list theire sources, and 'sdk' aggregates both. + */ + public static void writeGroupIndexes(Session session, + String artifactBasePath, String groupId, String version, + Set binaries, Set sources) { + try { + Set indexes = new TreeSet( + new ArtifactIdComparator()); + Artifact binariesArtifact = writeIndex(session, artifactBasePath, + groupId, RepoConstants.BINARIES_ARTIFACT_ID, version, + binaries); + indexes.add(binariesArtifact); + if (sources != null) { + Artifact sourcesArtifact = writeIndex(session, + artifactBasePath, groupId, + RepoConstants.SOURCES_ARTIFACT_ID, version, sources); + indexes.add(sourcesArtifact); + } + // sdk + writeIndex(session, artifactBasePath, groupId, + RepoConstants.SDK_ARTIFACT_ID, version, indexes); + session.save(); + } catch (RepositoryException e) { + throw new SlcException("Cannot write indexes for group " + groupId, + e); + } + } + + /** Write a group index. */ + private static Artifact writeIndex(Session session, + String artifactBasePath, String groupId, String artifactId, + String version, Set artifacts) throws RepositoryException { + Artifact artifact = new DefaultArtifact(groupId, artifactId, "pom", + version); + String pom = MavenConventionsUtils.artifactsAsDependencyPom(artifact, + artifacts, null); + Node node = RepoUtils.copyBytesAsArtifact( + session.getNode(artifactBasePath), artifact, pom.getBytes()); + addMavenChecksums(node); + return artifact; + } + + /** Add files containing the SHA-1 and MD5 checksums. */ + public static void addMavenChecksums(Node node) throws RepositoryException { + // TODO optimize + String sha = JcrUtils.checksumFile(node, "SHA-1"); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".sha1", + sha.getBytes()); + String md5 = JcrUtils.checksumFile(node, "MD5"); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".md5", + md5.getBytes()); + } + /** * Custom copy since the one in commons does not fit the needs when copying * a workspace completely.