From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 7 Jun 2022 10:55:56 +0000 (+0200)
Subject: Add OSGi APis and simplify Xalan.
X-Git-Tag: v2.3.5~37
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=4b9228ef254b2132a128ebbaa4603fd8fb084a91;p=gpl%2Fargeo-slc.git

Add OSGi APis and simplify Xalan.
---

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 b988f8b7c..9764b1f65 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
@@ -926,10 +926,10 @@ public class A2Factory {
 //		factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
 //		factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
 //		factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty"));
-		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
+//		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.osgi"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
-//		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
+		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.gis"));
 		System.exit(0);
diff --git a/tp/org.argeo.tp.apache/batik/merge.bnd b/tp/org.argeo.tp.apache/batik/merge.bnd
index 807d16f03..6c303ef09 100644
--- a/tp/org.argeo.tp.apache/batik/merge.bnd
+++ b/tp/org.argeo.tp.apache/batik/merge.bnd
@@ -1,7 +1,7 @@
 Bundle-License: Apache-2.0
 Bundle-SymbolicName: org.apache.batik
 SLC-Origin-M2: :1.14
-Export-Package: *
+Export-Package: org.apache.*
 Import-Package: \
 org.apache.batik.script.*;resolution:="optional",\
 org.apache.batik.*,\
diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.bnd b/tp/org.argeo.tp.apache/org.apache.xalan.bnd
deleted file mode 100644
index 1d2106b04..000000000
--- a/tp/org.argeo.tp.apache/org.apache.xalan.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xalan
-SLC-Origin-M2: xalan:xalan:2.7.2
\ No newline at end of file
diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.bnd.retired b/tp/org.argeo.tp.apache/org.apache.xalan.bnd.retired
new file mode 100644
index 000000000..1d2106b04
--- /dev/null
+++ b/tp/org.argeo.tp.apache/org.apache.xalan.bnd.retired
@@ -0,0 +1,3 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.xalan
+SLC-Origin-M2: xalan:xalan:2.7.2
\ No newline at end of file
diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd
deleted file mode 100644
index e0fb19c78..000000000
--- a/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xalan.serializer
-SLC-Origin-M2: xalan:serializer:2.7.2
\ No newline at end of file
diff --git a/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd.retired b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd.retired
new file mode 100644
index 000000000..e0fb19c78
--- /dev/null
+++ b/tp/org.argeo.tp.apache/org.apache.xalan.serializer.bnd.retired
@@ -0,0 +1,3 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.xalan.serializer
+SLC-Origin-M2: xalan:serializer:2.7.2
\ No newline at end of file
diff --git a/tp/org.argeo.tp.apache/xalan/merge.bnd b/tp/org.argeo.tp.apache/xalan/merge.bnd
new file mode 100644
index 000000000..4c36a94b8
--- /dev/null
+++ b/tp/org.argeo.tp.apache/xalan/merge.bnd
@@ -0,0 +1,6 @@
+Bundle-SymbolicName: org.apache.xalan
+SLC-Origin-M2: :2.7.2
+Export-Package: org.apache.*
+SLC-Origin-M2-Merge: \
+xalan:xalan,\
+xalan:serializer,\
\ No newline at end of file
diff --git a/tp/org.argeo.tp.osgi/osgi.cmpn.bnd b/tp/org.argeo.tp.osgi/osgi.cmpn.bnd
new file mode 100644
index 000000000..ef1e50320
--- /dev/null
+++ b/tp/org.argeo.tp.osgi/osgi.cmpn.bnd
@@ -0,0 +1,2 @@
+SLC-Origin-M2: org.osgi:osgi.cmpn:7.0.0
+SLC-Origin-ManifestNotModified: true
diff --git a/tp/org.argeo.tp.osgi/osgi.core.bnd b/tp/org.argeo.tp.osgi/osgi.core.bnd
new file mode 100644
index 000000000..16a91c476
--- /dev/null
+++ b/tp/org.argeo.tp.osgi/osgi.core.bnd
@@ -0,0 +1,2 @@
+SLC-Origin-M2: org.osgi:osgi.core:7.0.0
+SLC-Origin-ManifestNotModified: true