import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2;
import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2_REPO;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
throw new IllegalArgumentException("No M2 coordinates available for " + bndFile);
M2Artifact artifact = new M2Artifact(m2Coordinates);
URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact);
- Path downloaded = download(url, originBase, artifact);
+ Path downloaded = downloadMaven(url, originBase, artifact);
Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact);
// download
URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact);
- Path downloaded = download(url, originBase, artifact);
+ Path downloaded = downloadMaven(url, originBase, artifact);
Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact);
// logger.log(Level.DEBUG, () -> "Processed " + downloaded);
mergeProps.put(ManifestConstants.BUNDLE_VERSION.toString(), m2Version);
String artifactsStr = mergeProps.getProperty(ManifestConstants.SLC_ORIGIN_M2_MERGE.toString());
+ if (artifactsStr == null)
+ throw new IllegalArgumentException(
+ mergeBnd + ": " + ManifestConstants.SLC_ORIGIN_M2_MERGE + " must be set");
+
String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString())
? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString())
: null;
if (artifact.getVersion() == null)
artifact.setVersion(m2Version);
URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact);
- Path downloaded = download(url, originBase, artifact);
+ Path downloaded = downloadMaven(url, originBase, artifact);
JarEntry entry;
try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(downloaded), false)) {
entries: while ((entry = jarIn.getNextJarEntry()) != null) {
try (OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND)) {
out.write("\n".getBytes());
jarIn.transferTo(out);
- if (logger.isLoggable(DEBUG))
- logger.log(DEBUG, artifact.getArtifactId() + " - Appended " + entry.getName());
+ logger.log(Level.WARNING, artifact.getArtifactId() + " - Appended " + entry.getName());
}
} else if (entry.getName().startsWith("org/apache/batik/")) {
logger.log(Level.WARNING, "Skip " + entry.getName());
OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND);) {
out.write("\n".getBytes());
in.transferTo(out);
- if (logger.isLoggable(DEBUG))
- logger.log(DEBUG, "Appended " + p);
+ logger.log(Level.WARNING, "Appended " + p);
}
}
}
throws IOException {
if (sourceBundles)
return;
- M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources");
- URL sourcesUrl = M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
- Path sourcesDownloaded = download(sourcesUrl, originBase, artifact, true);
- processM2SourceJar(sourcesDownloaded, targetBundleDir);
- logger.log(Level.TRACE, () -> "Processed source " + sourcesDownloaded);
+ try {
+ M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources");
+ URL sourcesUrl = M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact);
+ Path sourcesDownloaded = downloadMaven(sourcesUrl, originBase, artifact, true);
+ processM2SourceJar(sourcesDownloaded, targetBundleDir);
+ logger.log(Level.TRACE, () -> "Processed source " + sourcesDownloaded);
+ } catch (Exception e) {
+ logger.log(Level.ERROR, () -> "Cannot download source for " + artifact);
+ }
}
}
/** Download a Maven artifact. */
- protected Path download(URL url, Path dir, M2Artifact artifact) throws IOException {
- return download(url, dir, artifact, false);
+ protected Path downloadMaven(URL url, Path dir, M2Artifact artifact) throws IOException {
+ return downloadMaven(url, dir, artifact, false);
}
/** Download a Maven artifact. */
- protected Path download(URL url, Path dir, M2Artifact artifact, boolean sources) throws IOException {
+ protected Path downloadMaven(URL url, Path dir, M2Artifact artifact, boolean sources) throws IOException {
return download(url, dir, artifact.getGroupId() + '/' + artifact.getArtifactId() + "-" + artifact.getVersion()
+ (sources ? "-sources" : "") + ".jar");
}
public void processEclipseArchive(Path duDir) {
try {
Path categoryRelativePath = descriptorsBase.relativize(duDir.getParent());
- // String category = categoryRelativePath.getFileName().toString();
Path targetCategoryBase = a2Base.resolve(categoryRelativePath);
Files.createDirectories(targetCategoryBase);
// first delete all directories from previous builds
throw new IllegalStateException("No url available for " + duDir);
commonProps.put(ManifestConstants.SLC_ORIGIN_URI.toString(), url);
}
- Path downloaded = tryDownload(url, originBase);
+ Path downloaded = tryDownloadArchive(url, originBase);
FileSystem zipFs = FileSystems.newFileSystem(downloaded, (ClassLoader) null);
Object previousValue = manifest.getMainAttributes().putValue(key, value);
if (previousValue != null && !previousValue.equals(value)) {
if (ManifestConstants.IMPORT_PACKAGE.toString().equals(key)
- || ManifestConstants.EXPORT_PACKAGE.toString().equals(key))
+ || ManifestConstants.EXPORT_PACKAGE.toString().equals(key)
+ || ManifestConstants.BUNDLE_LICENSE.toString().equals(key))
logger.log(Level.TRACE, file.getFileName() + ": " + key + " was modified");
else
logger.log(Level.WARNING, file.getFileName() + ": " + key + " was " + previousValue
}
/** Try to download from an URI. */
- protected Path tryDownload(String uri, Path dir) throws IOException {
+ protected Path tryDownloadArchive(String uri, Path dir) throws IOException {
// find mirror
List<String> urlBases = null;
String uriPrefix = null;
}
if (urlBases == null)
try {
- return download(new URL(uri), dir);
+ return downloadArchive(new URL(uri), dir);
} catch (FileNotFoundException e) {
throw new FileNotFoundException("Cannot find " + uri);
}
String relativePath = uri.substring(uriPrefix.length());
URL url = new URL(urlBase + relativePath);
try {
- return download(url, dir);
+ return downloadArchive(url, dir);
} catch (FileNotFoundException e) {
logger.log(Level.WARNING, "Cannot download " + url + ", trying another mirror");
}
throw new FileNotFoundException("Cannot find " + uri);
}
- /** Effectively download. */
- protected Path download(URL url, Path dir) throws IOException {
+ /**
+ * Effectively download. Synchronised in order to avoid downloading twice in
+ * parallel.
+ */
+ protected synchronized Path downloadArchive(URL url, Path dir) throws IOException {
return download(url, dir, (String) null);
}
Path dest;
if (name == null) {
- name = url.getPath().substring(url.getPath().lastIndexOf('/') + 1);
+ // We use also use parent directory in case the archive itself has a fixed name
+ name = url.getPath().substring(url.getPath().lastIndexOf('/') + 1)
+ .substring(url.getPath().lastIndexOf('/') + 1);
}
dest = dir.resolve(name);
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
if (file.getFileName().toString().equals("MANIFEST.MF"))
return super.visitFile(file, attrs);
- JarEntry entry = new JarEntry(bundleDir.relativize(file).toString());
+ JarEntry entry = new JarEntry(
+ bundleDir.relativize(file).toString().replace(File.separatorChar, '/'));
jarOut.putNextEntry(entry);
Files.copy(file, jarOut);
return super.visitFile(file, attrs);
projects / cc0 / argeo-build.git / blobdiff