Merge remote-tracking branch 'origin/unstable' into testing

diff --cc .gitmodules
index 0000000000000000000000000000000000000000,07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945
mode 000000,100644..100644
--- /dev/null
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,0 -1,4 +1,4 @@@
 -      url = http://git.argeo.org/cc0/argeo-build.git
 -      branch = unstable
+ [submodule "sdk/argeo-build"]
+       path = sdk/argeo-build
++      url = https://code.argeo.org/git/cc0/argeo-build.git
++      branch = merge-to-testing

diff --cc .project
index e6aedf80f6d5cc144e568b8ed2d27a82a8ac6aa4,73340e7b4b969391285b50670175e578cc207a76..70b4b558936ea6fabe779d892fdf30cc79ebdce8
--- 1/.project
--- 2/.project
+++ b/.project
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
-       <name>argeo-distribution</name>
 -      <name>argeo-tp-unstable</name>
++      <name>argeo-tp</name>
        <comment></comment>
        <projects>
        </projects>

diff --cc branch.mk
index 0000000000000000000000000000000000000000,afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0
mode 000000,100644..100644
--- /dev/null
--- 2/branch.mk
+++ b/branch.mk
@@@ -1,0 -1,1 +1,1 @@@
 -BRANCH=unstable
++BRANCH=testing

diff --cc sdk/argeo-build
index 0000000000000000000000000000000000000000,011962b1bb63d375622dbe79a50c45f16374b0a1..639ffc61c03f6aebf9cfe5e0f79dd0c4c6aa632a
mode 000000,160000..160000
--- /dev/null
--- 2/sdk/argeo-build
+++ b/sdk/argeo-build
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1
++Subproject commit 639ffc61c03f6aebf9cfe5e0f79dd0c4c6aa632a

diff --cc sdk/branches/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9dfd8b29a926c7bc496e71640cd2c29234cd258c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,4 @@@
++major=2
++minor=1
++micro=31
++qualifier=.next

diff --cc sdk/output-argeo-tp-backend.target
index 0000000000000000000000000000000000000000,187a7c25e3ed5193b4f95b3017f34148bcb6714b..ccb11ac0afd4a9f1d83169c2cc1762c9ff3e42de
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@@ -1,0 -1,13 +1,13 @@@
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-backend">
+       <locations>
 -              <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
++              <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.formats" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.poi" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
+               <location path="${project_loc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
++              <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
+       </locations>
+ </target>

diff --cc sdk/output-argeo-tp-minimal.target
index 0000000000000000000000000000000000000000,4c6530e53f95c674ffcfe18a0e0d9401eed9dbb6..e648937c62ba8c85eba7d2737a23e28520f9035d
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@@ -1,0 -1,11 +1,11 @@@
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-minimal">
+       <locations>
++              <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/org.argeo.tp.sdk" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+       </locations>
+       <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+ </target>

diff --cc sdk/output-argeo-tp-rap.target
index 0000000000000000000000000000000000000000,d5c7289741ccfd22c0666a8e5517af7a35829640..7e4d512c113df9ab6250213c590b17d35e6496e6
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@@ -1,0 -1,8 +1,8 @@@
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
 -              <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-rwt.target"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-rap">
+       <locations>
++              <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
++              <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-rwt.target"/>
+       </locations>
+ </target>

diff --cc sdk/output-argeo-tp-rcp.target
index 0000000000000000000000000000000000000000,8b198bcd4a8958b82e4eeae0703329368d1324e2..b94512f2f0e6b7a510fd4dfb3f3d55fb84514da8
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@@ -1,0 -1,8 +1,8 @@@
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
 -              <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-swt.target"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-rcp">
+       <locations>
++              <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
++              <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
+       </locations>
+ </target>

diff --cc sdk/output-argeo-tp-rwt.target
index 0000000000000000000000000000000000000000,0b4753fa8217adbeafb5f174944e86a85a969c62..ee966053d4d745a79bc5c2595c43f087152011c3
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-rwt.target
+++ b/sdk/output-argeo-tp-rwt.target
@@@ -1,0 -1,8 +1,8 @@@
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
 -              <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-rwt">
+       <locations>
++              <location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
++              <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+       </locations>
+ </target>

diff --cc sdk/output-argeo-tp-swt.target
index 0000000000000000000000000000000000000000,a3ec118734b5ff2d10f7e5ee5ff8b671206d2fb9..cb459d59b29371c2861f86f55c0de2b2f6f6d977
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-swt.target
+++ b/sdk/output-argeo-tp-swt.target
@@@ -1,0 -1,10 +1,10 @@@
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 -              <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-swt">
+       <locations>
++              <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
++              <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+       </locations>
+ </target>