From c84c35b40abfaeb10c2ca05ad493511a6e2d98a3 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Oct 2022 12:25:39 +0200
Subject: [PATCH] Adapt to new build system

---
 Makefile                                      |  8 +--
 Makefile-rcp.mk                               |  2 -
 branch.mk                                     |  2 +-
 cnf/build.bnd                                 |  3 --
 cnf/unstable.bnd                              | 10 ----
 configure                                     | 52 +------------------
 .../.classpath                                |  0
 .../.project                                  |  0
 .../bnd.bnd                                   |  0
 .../build.properties                          |  0
 .../slc/backup/vfs/AbstractAtomicBackup.java  |  0
 .../argeo/slc/backup/vfs/AtomicBackup.java    |  0
 .../argeo/slc/backup/vfs/BackupContext.java   |  0
 .../backup/vfs/BackupFileSystemManager.java   |  0
 .../org/argeo/slc/backup/vfs/BackupPurge.java |  0
 .../org/argeo/slc/backup/vfs/BackupUtils.java |  0
 .../slc/backup/vfs/MaintenanceException.java  |  0
 .../org/argeo/slc/backup/vfs/MySqlBackup.java |  0
 .../argeo/slc/backup/vfs/OpenLdapBackup.java  |  0
 .../argeo/slc/backup/vfs/OsCallBackup.java    |  0
 .../slc/backup/vfs/PostgreSqlBackup.java      |  0
 .../slc/backup/vfs/SimpleBackupContext.java   |  0
 .../slc/backup/vfs/SimpleBackupPurge.java     |  0
 .../org/argeo/slc/backup/vfs/SvnBackup.java   |  0
 .../argeo/slc/backup/vfs/SystemBackup.java    |  0
 .../argeo/slc/backup/vfs/package-info.java    |  0
 .../slc/cms/deploy/CmsDeployedSystem.java     |  0
 .../slc/cms/deploy/CmsDeploymentData.java     |  0
 .../argeo/slc/cms/deploy/CmsTargetData.java   |  0
 .../cms/deploy/SimpleCmsDeploymentData.java   |  0
 .../slc/cms/deploy/SimpleCmsTargetData.java   |  0
 .../deploy/osgi/CmsOsgiDeployedSystem.java    |  0
 .../cms/deploy/osgi/CmsOsgiDeployment.java    |  0
 .../slc/cms/distribution/A2Distribution.java  |  0
 .../distribution/A2ModuleDistribution.java    |  0
 .../httpclient3/HttpCredentialProvider.java   |  0
 .../slc/cms/httpclient3/SpnegoAuthScheme.java |  0
 .../cms/httpclient3/SpnegoCredentials.java    |  0
 .../org/argeo/slc/cms/httpclient3/jaas.cfg    |  0
 .../org/argeo/slc/cms/test/CmsSmokeTest.java  |  0
 sdk/argeo-build                               |  2 +-
 sdk/branches/unstable.bnd                     |  4 ++
 42 files changed, 10 insertions(+), 73 deletions(-)
 delete mode 100644 cnf/build.bnd
 delete mode 100644 cnf/unstable.bnd
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/.classpath (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/.project (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/bnd.bnd (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/build.properties (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/AtomicBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupContext.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupPurge.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupUtils.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/MaintenanceException.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/MySqlBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/OsCallBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SvnBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SystemBackup.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/package-info.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/CmsTargetData.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/distribution/A2Distribution.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/httpclient3/HttpCredentialProvider.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/httpclient3/SpnegoAuthScheme.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/httpclient3/SpnegoCredentials.java (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/httpclient3/jaas.cfg (100%)
 rename {cms/org.argeo.slc.cms => org.argeo.slc.cms}/src/org/argeo/slc/cms/test/CmsSmokeTest.java (100%)
 create mode 100644 sdk/branches/unstable.bnd

diff --git a/Makefile b/Makefile
index 8ff57035f..2ef8c78a8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +9,12 @@ BUNDLES = \
 org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
-cms/org.argeo.slc.cms \
+org.argeo.slc.cms \
 swt/rap/org.argeo.tool.server \
 
-VPATH = .:cms:swt/rap
-
 clean:
 	rm -rf $(BUILD_BASE)
 
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.sdk \
@@ -33,6 +28,7 @@ org.argeo.tp.jcr \
 org.argeo.tp.formats \
 org.argeo.tp.gis \
 org.argeo.cms \
+org.argeo.cms.jcr \
 swt/rap/org.argeo.cms \
 
 GRAALVM_HOME = /opt/graalvm-ce
diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index ce8900199..77c25317b 100644
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -8,8 +8,6 @@ A2_CATEGORY = org.argeo.slc
 BUNDLES = \
 swt/rcp/org.argeo.tool.desktop \
 
-VPATH = .:cms:swt/rcp
-
 clean:
 	rm -rf $(BUILD_BASE)
 
diff --git a/branch.mk b/branch.mk
index a6f848887..afde0f838 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-include $(SDK_SRC_BASE)/cnf/unstable.bnd
+BRANCH=unstable
\ No newline at end of file
diff --git a/cnf/build.bnd b/cnf/build.bnd
deleted file mode 100644
index f6e8be272..000000000
--- a/cnf/build.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
--include: \
-${workspace}/cnf/unstable.bnd, \
-${workspace}/sdk/argeo-build/argeo.bnd, \
diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
deleted file mode 100644
index 136d42a1b..000000000
--- a/cnf/unstable.bnd
+++ /dev/null
@@ -1,10 +0,0 @@
-MAJOR=2
-MINOR=3
-MICRO=4
-qualifier=.next
-
-category=org.argeo.slc
-Bundle-RequiredExecutionEnvironment=JavaSE-11
-
-argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
-argeo.rpm.suffix=-unstable
diff --git a/configure b/configure
index 9b3e9804b..47f7d9625 100755
--- a/configure
+++ b/configure
@@ -1,55 +1,7 @@
 #!/bin/sh
 
-# We build where we are
-SDK_BUILD_BASE=$(pwd -P)/output
-
 # Source are located where this script is
 SDK_SRC_BASE="$(cd "$(dirname "$0")"; pwd -P)"
 
-SDK_MK=$SDK_SRC_BASE/sdk.mk
-
-#echo SDK_BUILD_BASE=$SDK_BUILD_BASE
-#echo SDK_SRC_BASE=$SDK_SRC_BASE
-#echo SDK_MK=$SDK_MK
-
-if [ -f "$SDK_MK" ]; 
-then
-
-echo "File $SDK_MK already exists. Remove it in order to configure a new build location:"
-echo "rm $SDK_MK"
-exit 1
-
-else
-
-if [ -z "$JAVA_HOME" ]
-then
-echo "Environment variable JAVA_HOME must be set"
-exit 1
-fi
-
-# Create build directory, so that it can be used right away
-# and we check whether we have the rights
-mkdir -p $SDK_BUILD_BASE
-if [ -f "$SDK_MK" ];
-then
-echo "Cannot create $SDK_BUILD_BASE, SDK configuration has failed."
-exit 2
-fi
-
-# Generate sdk.mk
-cat > "$SDK_MK" <<EOF
-SDK_SRC_BASE := $SDK_SRC_BASE
-SDK_BUILD_BASE := $SDK_BUILD_BASE
-JAVA_HOME := $JAVA_HOME
-
-include \$(SDK_SRC_BASE)/branch.mk
-EOF
-
-
-echo SDK was configured.
-echo "JAVA_HOME        : $JAVA_HOME"
-echo "Base for sources : $SDK_SRC_BASE"
-echo "Base for builds  : $SDK_BUILD_BASE"
-exit 0
-fi
-
+# Source the configure script
+. $SDK_SRC_BASE/sdk/argeo-build/configure
diff --git a/cms/org.argeo.slc.cms/.classpath b/org.argeo.slc.cms/.classpath
similarity index 100%
rename from cms/org.argeo.slc.cms/.classpath
rename to org.argeo.slc.cms/.classpath
diff --git a/cms/org.argeo.slc.cms/.project b/org.argeo.slc.cms/.project
similarity index 100%
rename from cms/org.argeo.slc.cms/.project
rename to org.argeo.slc.cms/.project
diff --git a/cms/org.argeo.slc.cms/bnd.bnd b/org.argeo.slc.cms/bnd.bnd
similarity index 100%
rename from cms/org.argeo.slc.cms/bnd.bnd
rename to org.argeo.slc.cms/bnd.bnd
diff --git a/cms/org.argeo.slc.cms/build.properties b/org.argeo.slc.cms/build.properties
similarity index 100%
rename from cms/org.argeo.slc.cms/build.properties
rename to org.argeo.slc.cms/build.properties
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AtomicBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AtomicBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AtomicBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AtomicBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupContext.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupContext.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupContext.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupContext.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupPurge.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupPurge.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupPurge.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupPurge.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupUtils.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupUtils.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupUtils.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupUtils.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MaintenanceException.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MaintenanceException.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MaintenanceException.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MaintenanceException.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MySqlBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MySqlBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MySqlBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MySqlBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OsCallBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OsCallBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OsCallBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OsCallBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SvnBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SvnBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SvnBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SvnBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SystemBackup.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SystemBackup.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SystemBackup.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SystemBackup.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/package-info.java b/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/package-info.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/package-info.java
rename to org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/package-info.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsTargetData.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsTargetData.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsTargetData.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/CmsTargetData.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsDeploymentData.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployedSystem.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2Distribution.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2Distribution.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2Distribution.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2Distribution.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/HttpCredentialProvider.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/HttpCredentialProvider.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/HttpCredentialProvider.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/HttpCredentialProvider.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoAuthScheme.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoAuthScheme.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoAuthScheme.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoAuthScheme.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoCredentials.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoCredentials.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoCredentials.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/SpnegoCredentials.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/jaas.cfg b/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/jaas.cfg
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/jaas.cfg
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/httpclient3/jaas.cfg
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java b/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java
similarity index 100%
rename from cms/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java
rename to org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 3dc9a223f..a261043de 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 3dc9a223f1177b4eb34ccac1e96a354d4dd8ee25
+Subproject commit a261043de5f9d90373bb1e7f395e3371ba9e67ef
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
new file mode 100644
index 000000000..9eb7ef5fc
--- /dev/null
+++ b/sdk/branches/unstable.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=3
+micro=4
+qualifier=.next
\ No newline at end of file
-- 
2.30.2