Remove PostgreSQL EPSG database

[gpl/argeo-slc.git] / org.argeo.slc.factory / src / org / argeo / slc / factory / A2Factory.java

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 5aa9d9d5370a977f6b5f178b4be2bcb674d40a15..fab8db542b048dba50a686aabf989c053c418f66 100644 (file)
--- 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());
@@ -312,7 +314,7 @@ public class A2Factory {
                                                        logger.log(Level.WARNING, "Skip " + entry.getName());
                                                        continue entries;
                                                } else {
-                                                       throw new IllegalStateException("File " + target + " already exists");
+                                                       throw new IllegalStateException("File " + target + " from " + artifact + " already exists");
                                                }
                                        }
                                        logger.log(Level.TRACE, () -> "Copied " + target);
@@ -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.gis"));
                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"));