X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2FImportMavenDependencies.java;h=0bda72b7e87e91d272eaa86e0cf7d5b99f767345;hb=418a82cb85b477af9f2b8d850ca14c8512546643;hp=c6ae576d59f3452d74acca15d6924cec0788172e;hpb=5c3aaff50cc324fbfce95b6d961d844e4e6315ff;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java index c6ae576d5..0bda72b7e 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java @@ -17,64 +17,68 @@ package org.argeo.slc.repo.maven; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.util.Comparator; import java.util.HashSet; import java.util.Properties; import java.util.Set; import java.util.TreeSet; -import javax.jcr.Binary; import javax.jcr.Node; import javax.jcr.NodeIterator; -import javax.jcr.Property; import javax.jcr.Repository; -import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.jcr.JcrUtils; +import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.aether.AetherTemplate; -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.RepoConstants; +import org.argeo.slc.repo.RepoUtils; import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.graph.DependencyNode; import org.sonatype.aether.util.artifact.DefaultArtifact; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; +/** + * Import all the dependencies listed in a POM and their dependency graphs to a + * workspace. + */ public class ImportMavenDependencies implements Runnable { private final static Log log = LogFactory .getLog(ImportMavenDependencies.class); private AetherTemplate aetherTemplate; - private String rootCoordinates; + private String rootCoordinates = "org.argeo.dep:versions-all:pom:1.2.0"; + private String distCoordinates = "org.argeo.tp:dist:pom:1.3.0"; private Set excludedArtifacts = new HashSet(); private Repository repository; private String workspace; private String artifactBasePath = RepoConstants.ARTIFACTS_BASE_PATH; - private String distributionsBasePath = RepoConstants.DISTRIBUTIONS_BASE_PATH; - private String distributionName; private ArtifactIndexer artifactIndexer = new ArtifactIndexer(); private JarFileIndexer jarFileIndexer = new JarFileIndexer(); + private Comparator artifactComparator = new Comparator() { + public int compare(Artifact o1, Artifact o2) { + return o1.getArtifactId().compareTo(o2.getArtifactId()); + } + }; public void run() { // resolve Set artifacts = resolveDistribution(); // sync + sync(artifacts); + } + + void sync(Set artifacts) { Session session = null; try { session = JcrUtils.loginOrCreateWorkspace(repository, workspace); @@ -82,10 +86,13 @@ public class ImportMavenDependencies implements Runnable { NodeIterator nit = session.getNode(artifactBasePath).getNodes(); while (nit.hasNext()) { Node node = nit.nextNode(); - if (node.isNodeType(NodeType.NT_FOLDER)) + if (node.isNodeType(NodeType.NT_FOLDER) + || node.isNodeType(NodeType.NT_UNSTRUCTURED)) node.remove(); } session.save(); + + // sync syncDistribution(session, artifacts); } catch (Exception e) { throw new SlcException("Cannot import distribution", e); @@ -94,95 +101,125 @@ public class ImportMavenDependencies implements Runnable { } } - public Set resolveDistribution() { + /** + * Generate a POM with all the artifacts declared in root coordinates as + * dependencies AND in dependency management. + */ + void createDistPom() { try { Artifact pomArtifact = new DefaultArtifact(rootCoordinates); - Comparator artifactComparator = new Comparator() { - public int compare(Artifact o1, Artifact o2) { - return o1.getArtifactId().compareTo(o2.getArtifactId()); - } - }; Set registeredArtifacts = new TreeSet( artifactComparator); - parsePom(aetherTemplate, registeredArtifacts, pomArtifact); + MavenConventionsUtils.gatherPomDependencies(aetherTemplate, + registeredArtifacts, pomArtifact); + Artifact sdkArtifact = new DefaultArtifact(distCoordinates); + String sdkPom = MavenConventionsUtils.artifactsAsDependencyPom( + sdkArtifact, registeredArtifacts); if (log.isDebugEnabled()) log.debug("Gathered " + registeredArtifacts.size() - + " artifacts"); + + " artifacts:\n" + sdkPom); + } catch (Exception e) { + throw new SlcException("Cannot resolve distribution", e); + } + } - // Resolve and add non-optional dependencies + /** Returns all transitive dependencies of dist POM */ + private Set resolveDistribution() { + try { + Artifact distArtifact = new DefaultArtifact(distCoordinates); Set artifacts = new TreeSet(artifactComparator); - for (Artifact artifact : registeredArtifacts) { - try { - addArtifact(artifacts, artifact); - DependencyNode node = aetherTemplate - .resolveDependencies(artifact); - addDependencies(artifacts, node); - } catch (Exception e) { - log.error("Could not resolve dependencies of " + artifact - + ": " + e.getCause().getMessage()); - } - } + DependencyNode node = aetherTemplate + .resolveDependencies(distArtifact); + addDependencies(artifacts, node, null); - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) { log.debug("Resolved " + artifacts.size() + " artifacts"); - Properties distributionDescriptor = new Properties(); - for (Artifact artifact : artifacts) { - log.debug(artifact.getArtifactId() + " [" - + artifact.getVersion() + "]\t(" + artifact + ")"); - distributionDescriptor.setProperty(artifact.getArtifactId() - + ":" + artifact.getVersion(), artifact.toString()); - } - ByteArrayOutputStream out = new ByteArrayOutputStream(); - distributionDescriptor.store(out, ""); - log.debug(new String(out.toByteArray())); - out.close(); + // Properties distributionDescriptor = + // generateDistributionDescriptor(artifacts); + // ByteArrayOutputStream out = new ByteArrayOutputStream(); + // distributionDescriptor.store(out, ""); + // log.debug(new String(out.toByteArray())); + // out.close(); + } + /* + * for (Artifact artifact : registeredArtifacts) { try { Boolean + * wasAdded = addArtifact(artifacts, artifact); if (wasAdded) { + * DependencyNode node = aetherTemplate + * .resolveDependencies(artifact); addDependencies(artifacts, node, + * null); } } catch (Exception e) { + * log.error("Could not resolve dependencies of " + artifact + ": " + * + e.getCause().getMessage()); } + * + * } + * + * if (log.isDebugEnabled()) log.debug("Resolved " + + * artifacts.size() + " artifacts"); + * + * // distribution descriptor // Properties distributionDescriptor = + * // generateDistributionDescriptor(artifacts); // + * ByteArrayOutputStream out = new ByteArrayOutputStream(); // + * distributionDescriptor.store(out, ""); // log.debug(new + * String(out.toByteArray())); // out.close(); + */ return artifacts; } catch (Exception e) { throw new SlcException("Cannot resolve distribution", e); } } + protected Properties generateDistributionDescriptor(Set artifacts) { + Properties distributionDescriptor = new Properties(); + for (Artifact artifact : artifacts) { + log.debug(artifact.getArtifactId() + " [" + artifact.getVersion() + + "]\t(" + artifact + ")"); + distributionDescriptor.setProperty(artifact.getArtifactId() + ":" + + artifact.getVersion(), artifact.toString()); + } + return distributionDescriptor; + } + + /** Write artifacts to the target workspace, skipping excluded ones */ protected void syncDistribution(Session jcrSession, Set artifacts) { + Set artifactsWithoutSources = new TreeSet( + artifactComparator); Long begin = System.currentTimeMillis(); try { - JcrUtils.mkdirs(jcrSession, artifactBasePath); - JcrUtils.mkdirs(jcrSession, distributionsBasePath + '/' - + distributionName); + JcrUtils.mkfolders(jcrSession, artifactBasePath); artifacts: for (Artifact artifact : artifacts) { - File file = artifact.getFile(); - if (file == null) { - // log.warn("File not found for " + artifact); - - file = artifactToFile(artifact); + // skip excluded + if (excludedArtifacts.contains(artifact.getGroupId() + ":" + + artifact.getArtifactId())) { + if (log.isDebugEnabled()) + log.debug("Exclude " + artifact); + continue artifacts; + } - if (!file.exists()) { - log.warn("Generated file " + file + " for " + artifact - + " does not exist"); - continue artifacts; - } + File jarFile = MavenConventionsUtils.artifactToFile(artifact); + if (!jarFile.exists()) { + log.warn("Generated file " + jarFile + " for " + artifact + + " does not exist"); + continue artifacts; } + artifact.setFile(jarFile); try { - String parentPath = artifactBasePath - + (artifactBasePath.endsWith("/") ? "" : "/") - + artifactParentPath(artifact); + String parentPath = MavenConventionsUtils + .artifactParentPath(artifactBasePath, artifact); Node parentNode; - if (!jcrSession.itemExists(parentPath)) { - parentNode = JcrUtils.mkdirs(jcrSession, parentPath, - NodeType.NT_FOLDER); - } else { + if (!jcrSession.itemExists(parentPath)) + parentNode = JcrUtils.mkfolders(jcrSession, parentPath); + else parentNode = jcrSession.getNode(parentPath); - } Node fileNode; - if (!parentNode.hasNode(file.getName())) { - fileNode = createFileNode(parentNode, file); + if (!parentNode.hasNode(jarFile.getName())) { + fileNode = createFileNode(parentNode, jarFile); } else { - fileNode = parentNode.getNode(file.getName()); + fileNode = parentNode.getNode(jarFile.getName()); } if (artifactIndexer.support(fileNode.getPath())) @@ -191,17 +228,12 @@ public class ImportMavenDependencies implements Runnable { jarFileIndexer.index(fileNode); jcrSession.save(); - if (fileNode.hasProperty(SlcNames.SLC_SYMBOLIC_NAME)) { - String distPath = bundleDistributionPath(fileNode); - if (!jcrSession.itemExists(distPath) - && fileNode - .isNodeType(SlcTypes.SLC_BUNDLE_ARTIFACT)) - jcrSession.getWorkspace().clone( - jcrSession.getWorkspace().getName(), - fileNode.getPath(), distPath, false); - if (log.isDebugEnabled()) - log.debug("Synchronized " + fileNode); - } + addPdeSource(jcrSession, artifact, jarFile, + artifactsWithoutSources); + jcrSession.save(); + + if (log.isDebugEnabled()) + log.debug("Synchronized " + fileNode); } catch (Exception e) { log.error("Could not synchronize " + artifact, e); jcrSession.refresh(false); @@ -210,161 +242,106 @@ public class ImportMavenDependencies implements Runnable { } Long duration = (System.currentTimeMillis() - begin) / 1000; - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) { log.debug("Synchronized distribution in " + duration + "s"); + log.debug("The following artifacts have no sources:"); + for (Artifact artifact : artifactsWithoutSources) { + log.debug(artifact); + } + } } catch (Exception e) { throw new SlcException("Cannot synchronize distribution", e); } } - protected String artifactParentPath(Artifact artifact) { - return artifact.getGroupId().replace('.', '/') + '/' - + artifact.getArtifactId() + '/' + artifact.getVersion(); - } - - protected String bundleDistributionPath(Node fileNode) { + /** Try to add PDE sources */ + private void addPdeSource(Session session, Artifact artifact, + File artifactFile, Set artifactsWithoutSources) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); try { - return distributionsBasePath - + '/' - + distributionName - + '/' - + fileNode.getProperty(SlcNames.SLC_SYMBOLIC_NAME) - .getString() - + '_' - + fileNode.getProperty(SlcNames.SLC_BUNDLE_VERSION) - .getString(); - } catch (RepositoryException e) { - throw new SlcException("Cannot create distribution path for " - + fileNode, e); - } - } - - protected File artifactToFile(Artifact artifact) { - return new File(System.getProperty("user.home") - + File.separator - + ".m2" - + File.separator - + "repository" - + File.separator - + artifact.getGroupId().replace('.', File.separatorChar) - + File.separator - + artifact.getArtifactId() - + File.separator - + artifact.getVersion() - + File.separator - + artifact.getArtifactId() - + '-' - + artifact.getVersion() - + (artifact.getClassifier().equals("") ? "" - : '-' + artifact.getClassifier()) + '.' - + artifact.getExtension()); - } + File origSourceFile = null; + Artifact origSourceArtifact = new DefaultArtifact( + artifact.getGroupId(), artifact.getArtifactId(), "sources", + artifact.getExtension(), artifact.getVersion()); + Artifact newSourceArtifact = new DefaultArtifact( + artifact.getGroupId(), + artifact.getArtifactId() + ".source", + artifact.getExtension(), artifact.getVersion()); + try { + origSourceFile = aetherTemplate + .getResolvedFile(origSourceArtifact); + } catch (Exception e) { + // also try artifact following the conventions + origSourceArtifact = newSourceArtifact; + origSourceFile = aetherTemplate + .getResolvedFile(origSourceArtifact); + } - private Node createFileNode(Node parentNode, File file) { - Binary binary = null; - try { - Node fileNode = parentNode - .addNode(file.getName(), NodeType.NT_FILE); - Node contentNode = fileNode.addNode(Node.JCR_CONTENT, - NodeType.NT_RESOURCE); - binary = contentNode.getSession().getValueFactory() - .createBinary(new FileInputStream(file)); - contentNode.setProperty(Property.JCR_DATA, binary); - return fileNode; + String newSourceParentPath = MavenConventionsUtils + .artifactParentPath(artifactBasePath, newSourceArtifact); + Node newSourceParentNode = JcrUtils.mkfolders(session, + newSourceParentPath); + NameVersion bundleNameVersion = RepoUtils + .readNameVersion(artifactFile); + RepoUtils.packagesAsPdeSource(origSourceFile, bundleNameVersion, + out); + String newSourceFileName = MavenConventionsUtils + .artifactFileName(newSourceArtifact); + JcrUtils.copyBytesAsFile(newSourceParentNode, newSourceFileName, + out.toByteArray()); } catch (Exception e) { - throw new SlcException("Cannot create file node based on " + file - + " under " + parentNode, e); + log.error("Cannot add PDE source for " + artifact + ": " + e); + artifactsWithoutSources.add(artifact); } finally { - if (binary != null) - binary.dispose(); + IOUtils.closeQuietly(out); } } + private Node createFileNode(Node parentNode, File file) { + return JcrUtils.copyFile(parentNode, file); + } + /** Recursively adds non optional dependencies */ - private void addDependencies(Set artifacts, DependencyNode node) { + private void addDependencies(Set artifacts, DependencyNode node, + String ancestors) { + // if (artifacts.contains(node.getDependency().getArtifact())) + // return; + String currentArtifactId = node.getDependency().getArtifact() + .getArtifactId(); + if (log.isDebugEnabled()) { + log.debug("# Add dependency for " + currentArtifactId); + if (ancestors != null) + log.debug(ancestors); + } for (DependencyNode child : node.getChildren()) { if (!child.getDependency().isOptional()) { - addArtifact(artifacts, child.getDependency().getArtifact()); - addDependencies(artifacts, child); + if (willAdd(child.getDependency().getArtifact())) { + addArtifact(artifacts, child.getDependency().getArtifact()); + addDependencies(artifacts, child, currentArtifactId + "\n" + + (ancestors != null ? ancestors : "")); + } } } } - private void addArtifact(Set artifacts, Artifact artifact) { - if (!excludedArtifacts.contains(artifact.getGroupId() + ":" - + artifact.getArtifactId())) + /** @return whether it was added */ + private Boolean addArtifact(Set artifacts, Artifact artifact) { + Boolean willAdd = willAdd(artifact); + if (willAdd) artifacts.add(artifact); + else + log.info("Skip " + artifact); + return willAdd; } - /** - * Directly parses Maven POM XML format in order to find all artifacts - * references under the dependency and dependencyManagement tags. This is - * meant to migrate existing pom registering a lot of artifacts, not to - * replace Maven resolving. - */ - protected void parsePom(AetherTemplate aetherTemplate, - Set artifacts, Artifact pomArtifact) { - if (log.isDebugEnabled()) - log.debug("Gather dependencies for " + pomArtifact); - - try { - File file = aetherTemplate.getResolvedFile(pomArtifact); - DocumentBuilder documentBuilder = DocumentBuilderFactory - .newInstance().newDocumentBuilder(); - Document doc = documentBuilder.parse(file); - - // properties - Properties props = new Properties(); - props.setProperty("project.version", pomArtifact.getBaseVersion()); - NodeList properties = doc.getElementsByTagName("properties"); - if (properties.getLength() > 0) { - NodeList propertiesElems = properties.item(0).getChildNodes(); - for (int i = 0; i < propertiesElems.getLength(); i++) { - if (propertiesElems.item(i) instanceof Element) { - Element property = (Element) propertiesElems.item(i); - props.put(property.getNodeName(), - property.getTextContent()); - } - } - } - - // dependencies (direct and dependencyManagement) - NodeList dependencies = doc.getElementsByTagName("dependency"); - for (int i = 0; i < dependencies.getLength(); i++) { - Element dependency = (Element) dependencies.item(i); - String groupId = dependency.getElementsByTagName("groupId") - .item(0).getTextContent().trim(); - String artifactId = dependency - .getElementsByTagName("artifactId").item(0) - .getTextContent().trim(); - String version = dependency.getElementsByTagName("version") - .item(0).getTextContent().trim(); - if (version.startsWith("${")) { - String versionKey = version.substring(0, - version.length() - 1).substring(2); - if (!props.containsKey(versionKey)) - throw new SlcException("Cannot interpret version " - + version); - version = props.getProperty(versionKey); - } - NodeList scopes = dependency.getElementsByTagName("scope"); - if (scopes.getLength() > 0 - && scopes.item(0).getTextContent().equals("import")) { - // recurse - parsePom(aetherTemplate, artifacts, new DefaultArtifact( - groupId, artifactId, "pom", version)); - } else { - // TODO: deal with scope? - // TODO: deal with type - String type = "jar"; - Artifact artifact = new DefaultArtifact(groupId, - artifactId, type, version); - artifacts.add(artifact); - } - } - } catch (Exception e) { - throw new SlcException("Cannot process " + pomArtifact, e); - } + private Boolean willAdd(Artifact artifact) { + Boolean willAdd = true; + if (excludedArtifacts.contains(artifact.getGroupId() + ":" + + artifact.getArtifactId())) + willAdd = false; + else if (excludedArtifacts.contains(artifact.getGroupId() + ":*")) + willAdd = false; + return willAdd; } public void setAetherTemplate(AetherTemplate aetherTemplate) { @@ -379,10 +356,6 @@ public class ImportMavenDependencies implements Runnable { this.rootCoordinates = rootCoordinates; } - public void setDistributionName(String distributionName) { - this.distributionName = distributionName; - } - public void setRepository(Repository repository) { this.repository = repository; } @@ -391,4 +364,12 @@ public class ImportMavenDependencies implements Runnable { this.workspace = workspace; } + public void setDistCoordinates(String distCoordinates) { + this.distCoordinates = distCoordinates; + } + + public void setArtifactBasePath(String artifactBasePath) { + this.artifactBasePath = artifactBasePath; + } + }