X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.factory%2Fsrc%2Forg%2Fargeo%2Fslc%2Ffactory%2FA2Factory.java;h=7048a39edb47ff534efbb59930e2550668f4077a;hb=1bb5dafb8b8ba4b69a7bed7242bb8724c79de583;hp=5aa9d9d5370a977f6b5f178b4be2bcb674d40a15;hpb=fbc38873a20bc5d5974c81e9bd4ec6904c708fed;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index 5aa9d9d53..7048a39ed 100644
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -265,6 +265,8 @@ public class A2Factory {
 				: null;
 
 		String bundleSymbolicName = mergeProps.getProperty(ManifestConstants.BUNDLE_SYMBOLICNAME.toString());
+		if (bundleSymbolicName == null)
+			throw new IllegalArgumentException("Bundle-SymbolicName must be set in " + mergeBnd);
 		DefaultCategoryNameVersion nameVersion = new DefaultArtifact(
 				category + ":" + bundleSymbolicName + ":" + m2Version);
 		Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch());
@@ -475,6 +477,8 @@ public class A2Factory {
 					continue entries;
 				if (entry.getName().startsWith("module-info.java"))// skip META-INF entries
 					continue entries;
+				if (entry.getName().startsWith("/")) // absolute paths
+					continue entries;
 				Path target = targetSourceDir.resolve(entry.getName());
 				Files.createDirectories(target.getParent());
 				if (!Files.exists(target)) {
@@ -872,16 +876,7 @@ public class A2Factory {
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
-//		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
-		factory.processEclipseArchive(
-				descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox"));
-		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rwt").resolve("eclipse-rwt"));
-		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap"));
-		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-swt"));
-		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-nebula"));
-		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox"));
-		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
-		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
+		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
 		System.exit(0);
 
 		// Eclipse
@@ -894,7 +889,6 @@ public class A2Factory {
 		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox"));
 		factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
 		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
-		System.exit(0);
 
 		// Maven
 		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));