From 8bc3f03bf67391e38a3ed681bc147ec01000033b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Mar 2023 09:20:47 +0100
Subject: [PATCH] Improve Apache Commons in TP utils

---
 repackage/org.argeo.tp.earth/geotools/merge.bnd             | 2 --
 repackage/org.argeo.tp.utils/asm/common.bnd                 | 2 ++
 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd      | 1 +
 .../asm/org.objectweb.asm.tree.analysis.bnd                 | 1 +
 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd | 1 +
 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd | 1 +
 repackage/org.argeo.tp.utils/net.sf.cglib.bnd               | 6 ++++++
 .../org.apache.commons.dbcp.bnd                             | 1 +
 repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd   | 5 +++++
 .../org.argeo.tp.utils/org.apache.commons.digester.bnd      | 2 ++
 .../org.apache.commons.pool.bnd                             | 0
 repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd   | 2 ++
 sdk/output-argeo-tp-apps.target                             | 4 +++-
 sdk/output-argeo-tp-platform.target                         | 2 +-
 14 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 repackage/org.argeo.tp.utils/asm/common.bnd
 create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
 create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
 create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
 create mode 100644 repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
 create mode 100644 repackage/org.argeo.tp.utils/net.sf.cglib.bnd
 rename repackage/{org.argeo.tp.jcr => org.argeo.tp.utils}/org.apache.commons.dbcp.bnd (99%)
 create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
 create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
 rename repackage/{org.argeo.tp.jcr => org.argeo.tp.utils}/org.apache.commons.pool.bnd (100%)
 create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd

diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index 72c3760..ba066ea 100644
--- a/repackage/org.argeo.tp.earth/geotools/merge.bnd
+++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd
@@ -38,8 +38,6 @@ org.jdom2.*;resolution:="optional",\
 org.junit.*;resolution:="optional",\
 org.parboiled.*;resolution:="optional",\
 org.picocontainer.*;resolution:="optional",\
-org.apache.commons.digester.*;resolution:="optional",\
-org.apache.commons.pool.*;resolution:="optional",\
 *
 
 Argeo-Origin-M2-Merge: \
diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd b/repackage/org.argeo.tp.utils/asm/common.bnd
new file mode 100644
index 0000000..cc32d2b
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/asm/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: :9.4
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
new file mode 100644
index 0000000..c5eac67
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
new file mode 100644
index 0000000..c76963a
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.analysis.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm-analysis
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
new file mode 100644
index 0000000..9ab0bbf
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.tree.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm-tree
diff --git a/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
new file mode 100644
index 0000000..84e6979
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/asm/org.objectweb.asm.util.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.ow2.asm:asm-util
diff --git a/repackage/org.argeo.tp.utils/net.sf.cglib.bnd b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
new file mode 100644
index 0000000..78a087f
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/net.sf.cglib.bnd
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: cglib:cglib:3.3.0
+
+Import-Package: \
+org.apache.tools.ant.*;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
similarity index 99%
rename from repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
rename to repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
index b2af1db..2fea39f 100644
--- a/repackage/org.argeo.tp.jcr/org.apache.commons.dbcp.bnd
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp.bnd
@@ -1,4 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
 Argeo-Origin-M2: commons-dbcp:commons-dbcp:1.4
+
 Import-Package: javax.transaction.*; resolution:="optional",\
 *
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
new file mode 100644
index 0000000..1f6e450
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.9.0
+
+Import-Package: javax.transaction.*; resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
new file mode 100644
index 0000000..3936876
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.digester.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-digester:commons-digester:2.1
diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
similarity index 100%
rename from repackage/org.argeo.tp.jcr/org.apache.commons.pool.bnd
rename to repackage/org.argeo.tp.utils/org.apache.commons.pool.bnd
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
new file mode 100644
index 0000000..6826cea
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-pool2:2.11.1
diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target
index 644d044..412a3a5 100644
--- a/sdk/output-argeo-tp-apps.target
+++ b/sdk/output-argeo-tp-apps.target
@@ -3,7 +3,9 @@
 <target name="argeo-tp-backend">
 	<locations>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.utils" type="Directory"/>
-		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.publish" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.math" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.earth" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
index d63ff29..39755d1 100644
--- a/sdk/output-argeo-tp-platform.target
+++ b/sdk/output-argeo-tp-platform.target
@@ -7,7 +7,7 @@
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
-		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.httpd" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.build" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 	</locations>
-- 
2.30.2