X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=1ed01ad2dae4b0c2adf71871c2fe53b5a5fa0eb3;hb=dd7d34930a31c4b72a4f397a9bcb6a3468af6c52;hp=09f78f746912239c9c218cece9974bfcbf7310e4;hpb=459eae769ff28635140b23c127b3a4c883c8fd0e;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 09f78f7..1ed01ad 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -193,9 +193,9 @@ public class Repackage {
 	 * Subdirectory of the jar file where origin informations (changes, legal
 	 * notices etc. are stored)
 	 */
-	final static String A2_ORIGIN = "A2-ORIGIN";
+	final static String ARGEO_ORIGIN = "ARGEO-ORIGIN";
 	/** File detailing modifications to the original component. */
-	final static String CHANGES = A2_ORIGIN + "/changes";
+	final static String CHANGES = ARGEO_ORIGIN + "/changes";
 	/**
 	 * Name of the file at the root of the repackaged jar, which prominently
 	 * notifies that the component has be repackaged.
@@ -527,7 +527,7 @@ public class Repackage {
 						continue entries;
 					}
 					if (entry.getName().equals("META-INF/MANIFEST.MF")) {
-						Path originalManifest = bundleDir.resolve(A2_ORIGIN).resolve(artifact.getGroupId())
+						Path originalManifest = bundleDir.resolve(ARGEO_ORIGIN).resolve(artifact.getGroupId())
 								.resolve(artifact.getArtifactId()).resolve("MANIFEST.MF");
 						Files.createDirectories(originalManifest.getParent());
 						try (OutputStream out = Files.newOutputStream(originalManifest)) {
@@ -542,7 +542,7 @@ public class Repackage {
 							|| entry.getName().endsWith("LICENSE") || entry.getName().endsWith("LICENSE.md")
 							|| entry.getName().endsWith("LICENSE-notice.md") || entry.getName().endsWith("COPYING")
 							|| entry.getName().endsWith("COPYING.LESSER")) {
-						Path artifactOriginDir = bundleDir.resolve(A2_ORIGIN).resolve(artifact.getGroupId())
+						Path artifactOriginDir = bundleDir.resolve(ARGEO_ORIGIN).resolve(artifact.getGroupId())
 								.resolve(artifact.getArtifactId());
 						Path target = artifactOriginDir.resolve(entry.getName());
 						Files.createDirectories(target.getParent());
@@ -977,7 +977,7 @@ public class Repackage {
 
 			// copy original MANIFEST
 			if (sourceManifest != null) {
-				Path originalManifest = bundleDir.resolve(A2_ORIGIN).resolve("MANIFEST.MF");
+				Path originalManifest = bundleDir.resolve(ARGEO_ORIGIN).resolve("MANIFEST.MF");
 				Files.createDirectories(originalManifest.getParent());
 				try (OutputStream out = Files.newOutputStream(originalManifest)) {
 					sourceManifest.write(out);
@@ -1423,8 +1423,8 @@ public class Repackage {
 			String m2Repo = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_M2_REPO.toString());
 			String originDesc = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_M2.toString());
 			if (originDesc != null)
-				writer.append("The original component has M2 coordinates " + originDesc.replace(',', '\n') + "\n"
-						+ (m2Repo != null ? "\nin M2 repository" + m2Repo + "\n" : "") + "\n");
+				writer.append("The original component has M2 coordinates:\n" + originDesc.replace(',', '\n') + "\n"
+						+ (m2Repo != null ? "\nin M2 repository " + m2Repo + "\n" : ""));
 			else {
 				originDesc = manifest.getMainAttributes().getValue(ARGEO_ORIGIN_URI.toString());
 				if (originDesc != null)