Improve publishing third parties.

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..7048a39edb47ff534efbb59930e2550668f4077a 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());
@@ -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"));

diff --git a/tp/org.argeo.tp.formats/com.lowagie.bnd b/tp/org.argeo.tp.formats/com.lowagie.bnd
new file mode 100644 (file)
index 0000000..b8bd293
--- /dev/null
+++ b/tp/org.argeo.tp.formats/com.lowagie.bnd
@@ -0,0 +1,3 @@
+Bundle-License: LGPL-2.1
+Bundle-SymbolicName: com.lowagie
+SLC-Origin-M2: com.github.librepdf:openpdf:1.3.27

diff --git a/tp/org.argeo.tp.formats/flying-saucer/common.bnd b/tp/org.argeo.tp.formats/flying-saucer/common.bnd
new file mode 100644 (file)
index 0000000..8fc898c
--- /dev/null
+++ b/tp/org.argeo.tp.formats/flying-saucer/common.bnd
@@ -0,0 +1,2 @@
+Bundle-License: LGPL-3
+SLC-Origin-M2: :9.1.22
\ No newline at end of file

diff --git a/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd
new file mode 100644 (file)
index 0000000..19312ee
--- /dev/null
+++ b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.core.bnd
@@ -0,0 +1 @@
+SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-core

diff --git a/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd
new file mode 100644 (file)
index 0000000..0c241bd
--- /dev/null
+++ b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.openpdf.bnd
@@ -0,0 +1 @@
+SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf

diff --git a/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd
new file mode 100644 (file)
index 0000000..3a1c6d3
--- /dev/null
+++ b/tp/org.argeo.tp.formats/flying-saucer/org.xhtmlrenderer.swt.bnd
@@ -0,0 +1,4 @@
+SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt
+IMport-Package:\
+org.eclipse.swt.printing;resolution:="optional",\
+*
\ No newline at end of file

diff --git a/tp/org.argeo.tp.formats/fop/common.bnd b/tp/org.argeo.tp.formats/fop/common.bnd
deleted file mode 100644 (file)
index 64a95da..0000000
--- a/tp/org.argeo.tp.formats/fop/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :2.7
\ No newline at end of file

diff --git a/tp/org.argeo.tp.formats/fop/merge.bnd b/tp/org.argeo.tp.formats/fop/merge.bnd
new file mode 100644 (file)
index 0000000..96c438a
--- /dev/null
+++ b/tp/org.argeo.tp.formats/fop/merge.bnd
@@ -0,0 +1,15 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.fop
+SLC-Origin-M2: :2.7
+SLC-Origin-M2-Merge: \
+org.apache.xmlgraphics:fop-core,\
+org.apache.xmlgraphics:fop-util,\
+org.apache.xmlgraphics:fop-events,\
+
+Export-Package: org.apache.fop.*
+
+Import-Package: \
+javax.media.jai;resolution:="optional",\
+com.thoughtworks.qdox.*;resolution:="optional",\
+org.apache.tools.ant.*;resolution:="optional",\
+*

diff --git a/tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd b/tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd
deleted file mode 100644 (file)
index ba69e0b..0000000
--- a/tp/org.argeo.tp.formats/fop/org.apache.fop.core.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-SymbolicName: org.apache.fop.core
-SLC-Origin-M2: org.apache.xmlgraphics:fop-core
-Import-Package: \
-javax.media.jai;resolution:="optional",\
-org.apache.tools.ant.*;resolution:="optional",\
-*
-Export-Package: \
-!org.apache.fop.util.*,\
-*
\ No newline at end of file

diff --git a/tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd b/tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd
deleted file mode 100644 (file)
index 31265cc..0000000
--- a/tp/org.argeo.tp.formats/fop/org.apache.fop.events.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-SymbolicName: org.apache.fop.events
-SLC-Origin-M2: org.apache.xmlgraphics:fop-events
-Import-Package: \
-com.thoughtworks.qdox.*;resolution:="optional",\
-org.apache.tools.ant.*;resolution:="optional",\
-*

diff --git a/tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd b/tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd
deleted file mode 100644 (file)
index c2ea982..0000000
--- a/tp/org.argeo.tp.formats/fop/org.apache.fop.util.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-SymbolicName: org.apache.fop.util
-SLC-Origin-M2: org.apache.xmlgraphics:fop-util