X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.build%2Fsrc%2Forg%2Fargeo%2Fslc%2Fbuild%2FA2Factory.java;h=dcf706299eeb842ca31727547cd0975e86248ca0;hb=2aed4ec1227628a9630471bddc0d903e7cb48eaa;hp=f0aea3cb2c7a820bed83eb36b6ee408ff46a7467;hpb=0a0a2df6ccd15749c13b562cca3eace1c4fa5b49;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java
index f0aea3cb2..dcf706299 100644
--- a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java
+++ b/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java
@@ -4,6 +4,7 @@ import static java.lang.System.Logger.Level.DEBUG;
 import static org.argeo.slc.ManifestConstants.BUNDLE_LICENSE;
 import static org.argeo.slc.ManifestConstants.BUNDLE_SYMBOLICNAME;
 import static org.argeo.slc.ManifestConstants.BUNDLE_VERSION;
+import static org.argeo.slc.ManifestConstants.EXPORT_PACKAGE;
 import static org.argeo.slc.ManifestConstants.SLC_ORIGIN_M2;
 
 import java.io.FileNotFoundException;
@@ -102,7 +103,7 @@ public class A2Factory {
 			URL url = MavenConventionsUtils.mavenCentralUrl(artifact);
 			Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar");
 
-			Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps);
+			Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact);
 
 			downloadAndProcessM2Sources(artifact, targetBundleDir);
 
@@ -178,7 +179,7 @@ public class A2Factory {
 					}
 				}
 				mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates());
-				Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps);
+				Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact);
 //				logger.log(Level.DEBUG, () -> "Processed " + downloaded);
 
 				// sources
@@ -201,7 +202,8 @@ public class A2Factory {
 
 	}
 
-	protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps) {
+	protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps,
+			DefaultArtifact artifact) {
 
 		try {
 			Map<String, String> additionalEntries = new TreeMap<>();
@@ -216,6 +218,22 @@ public class A2Factory {
 					additionalEntries.put(key.toString(), value);
 				}
 			} else {
+				if (artifact != null) {
+					if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
+						fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName());
+					}
+					if (!fileProps.containsKey(BUNDLE_VERSION.toString())) {
+						fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion());
+					}
+				}
+
+				if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) {
+					fileProps.put(EXPORT_PACKAGE.toString(),
+							"*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\"");
+				}
+//				if (!fileProps.contains(IMPORT_PACKAGE.toString())) {
+//					fileProps.put(IMPORT_PACKAGE.toString(), "*");
+//				}
 
 				try (Analyzer bndAnalyzer = new Analyzer()) {
 					bndAnalyzer.setProperties(fileProps);
@@ -232,11 +250,23 @@ public class A2Factory {
 						case "Created-By":
 							continue keys;
 						}
+						if("Require-Capability".equals(key.toString()) && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\""))
+							continue keys;// hack for very old classes
 						additionalEntries.put(key.toString(), value.toString());
-						// logger.log(DEBUG, () -> key + "=" + value);
+						logger.log(DEBUG, () -> key + "=" + value);
 
 					}
 				}
+
+//				try (Builder bndBuilder = new Builder()) {
+//					Jar jar = new Jar(downloaded.toFile());
+//					bndBuilder.addClasspath(jar);
+//					Path targetBundleDir = targetCategoryBase.resolve(artifact.getName() + "." + artifact.getBranch());
+//
+//					Jar target = new Jar(targetBundleDir.toFile());
+//					bndBuilder.setJar(target);
+//					return targetBundleDir;
+//				}
 			}
 			Path targetBundleDir = processBundleJar(downloaded, targetCategoryBase, additionalEntries);
 			logger.log(Level.DEBUG, () -> "Processed " + downloaded);
@@ -347,6 +377,7 @@ public class A2Factory {
 			Manifest manifest = new Manifest(jarIn.getManifest());
 
 			// remove problematic entries in MANIFEST
+			manifest.getEntries().clear();
 //			Set<String> entriesToDelete = new HashSet<>();
 //			for (String key : manifest.getEntries().keySet()) {
 ////				logger.log(DEBUG, "## " + key);
@@ -388,6 +419,8 @@ public class A2Factory {
 			entries: while ((entry = jarIn.getNextJarEntry()) != null) {
 				if (entry.isDirectory())
 					continue entries;
+				if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
+					continue entries;
 				Path target = targetBundleDir.resolve(entry.getName());
 				Files.createDirectories(target.getParent());
 				Files.copy(jarIn, target);
@@ -397,7 +430,7 @@ public class A2Factory {
 			// copy MANIFEST
 			Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF");
 			Files.createDirectories(manifestPath.getParent());
-			for (String key : entries.keySet()) {
+			 for (String key : entries.keySet()) {
 				String value = entries.get(key);
 				Object previousValue = manifest.getMainAttributes().putValue(key, value);
 				if (previousValue != null && !previousValue.equals(value)) {
@@ -581,6 +614,10 @@ public class A2Factory {
 
 		Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
 
+//		factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
+//		factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp/slf4j"));
+//		System.exit(0);
+
 		// Eclipse
 		factory.processEclipseArchive(
 				descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox"));
@@ -588,9 +625,10 @@ public class A2Factory {
 		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
 
 		// Maven
+		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
 		factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
 		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
 		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty"));
-		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
+		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr"));
 	}
 }