From 2b94ec00b97683e9f035319e055be1dab065bf68 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 28 May 2022 08:19:20 +0200
Subject: [PATCH] Introduce CMS-specific SLC module

---
 Makefile                                      |  2 ++
 cms/org.argeo.slc.cms/.classpath              |  7 +++++
 cms/org.argeo.slc.cms/.project                | 28 +++++++++++++++++++
 cms/org.argeo.slc.cms/bnd.bnd                 |  3 ++
 cms/org.argeo.slc.cms/build.properties        |  4 +++
 .../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
 .../src/org/argeo/slc/cli}/ArgeoCli.java      |  2 +-
 .../src/org/argeo/slc/cli/posix/Echo.java     |  0
 .../argeo/slc/cli/posix/PosixCommands.java    |  0
 .../org/argeo/slc/cli/posix/package-info.java |  0
 .../slc/cms/deploy/SimpleCmsTargetData.java   | 10 +++++++
 .../org/argeo/slc/cms/test/CmsSmokeTest.java  | 20 +++++++++++++
 org.argeo.slc.runtime/bnd.bnd                 |  4 +--
 28 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 cms/org.argeo.slc.cms/.classpath
 create mode 100644 cms/org.argeo.slc.cms/.project
 create mode 100644 cms/org.argeo.slc.cms/bnd.bnd
 create mode 100644 cms/org.argeo.slc.cms/build.properties
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/AtomicBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupContext.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupPurge.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/BackupUtils.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/MaintenanceException.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/MySqlBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/OsCallBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SvnBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/SystemBackup.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/backup/vfs/package-info.java (100%)
 rename {org.argeo.slc.runtime/src/org/argeo/slc/runtime => cms/org.argeo.slc.cms/src/org/argeo/slc/cli}/ArgeoCli.java (96%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/cli/posix/Echo.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/cli/posix/PosixCommands.java (100%)
 rename {org.argeo.slc.runtime => cms/org.argeo.slc.cms}/src/org/argeo/slc/cli/posix/package-info.java (100%)
 create mode 100644 cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java
 create mode 100644 cms/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java

diff --git a/Makefile b/Makefile
index ff9eec9dc..fd7e29145 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ BUNDLES = \
 org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
+cms/org.argeo.slc.cms \
 
+VPATH = .:cms
 
 clean:
 	rm -rf $(BUILD_BASE)
diff --git a/cms/org.argeo.slc.cms/.classpath b/cms/org.argeo.slc.cms/.classpath
new file mode 100644
index 000000000..81fe078c2
--- /dev/null
+++ b/cms/org.argeo.slc.cms/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cms/org.argeo.slc.cms/.project b/cms/org.argeo.slc.cms/.project
new file mode 100644
index 000000000..95c8de1f4
--- /dev/null
+++ b/cms/org.argeo.slc.cms/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.cms</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/cms/org.argeo.slc.cms/bnd.bnd b/cms/org.argeo.slc.cms/bnd.bnd
new file mode 100644
index 000000000..927563faf
--- /dev/null
+++ b/cms/org.argeo.slc.cms/bnd.bnd
@@ -0,0 +1,3 @@
+Import-Package: \
+org.apache.commons.logging,\
+*
\ No newline at end of file
diff --git a/cms/org.argeo.slc.cms/build.properties b/cms/org.argeo.slc.cms/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/cms/org.argeo.slc.cms/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AbstractAtomicBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/AtomicBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AtomicBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/AtomicBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/AtomicBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupContext.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupContext.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupContext.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupContext.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupFileSystemManager.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupPurge.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupPurge.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupPurge.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupPurge.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupUtils.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupUtils.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/BackupUtils.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/BackupUtils.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/MaintenanceException.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MaintenanceException.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/MaintenanceException.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MaintenanceException.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/MySqlBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MySqlBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/MySqlBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/MySqlBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OpenLdapBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/OsCallBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OsCallBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/OsCallBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/OsCallBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/PostgreSqlBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupContext.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SimpleBackupPurge.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SvnBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SvnBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SvnBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SvnBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SystemBackup.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SystemBackup.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/SystemBackup.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/SystemBackup.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/package-info.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/package-info.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/backup/vfs/package-info.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/backup/vfs/package-info.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ArgeoCli.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cli/ArgeoCli.java
similarity index 96%
rename from org.argeo.slc.runtime/src/org/argeo/slc/runtime/ArgeoCli.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/cli/ArgeoCli.java
index 3e62f575b..4e23837b8 100644
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ArgeoCli.java
+++ b/cms/org.argeo.slc.cms/src/org/argeo/slc/cli/ArgeoCli.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.runtime;
+package org.argeo.slc.cli;
 
 import org.apache.commons.cli.Option;
 import org.argeo.cms.cli.CommandsCli;
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/Echo.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cli/posix/Echo.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/Echo.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/cli/posix/Echo.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/PosixCommands.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cli/posix/PosixCommands.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/PosixCommands.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/cli/posix/PosixCommands.java
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/package-info.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cli/posix/package-info.java
similarity index 100%
rename from org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/package-info.java
rename to cms/org.argeo.slc.cms/src/org/argeo/slc/cli/posix/package-info.java
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java
new file mode 100644
index 000000000..9ba955a54
--- /dev/null
+++ b/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/SimpleCmsTargetData.java
@@ -0,0 +1,10 @@
+package org.argeo.slc.cms.deploy;
+
+import java.nio.file.Path;
+
+import org.argeo.slc.deploy.TargetData;
+
+public class SimpleCmsTargetData implements TargetData {
+	private Integer httpPort;
+	private Path instanceData;
+}
diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java
new file mode 100644
index 000000000..10b088c53
--- /dev/null
+++ b/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/test/CmsSmokeTest.java
@@ -0,0 +1,20 @@
+package org.argeo.slc.cms.test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class CmsSmokeTest {
+
+	public static void main(String[] args) throws IOException {
+		Path instanceData;
+		if (args.length > 0) {
+			instanceData = Paths.get(args[0]);
+		} else {
+			instanceData = Files.createTempDirectory("cms-test");
+		}
+
+	}
+
+}
diff --git a/org.argeo.slc.runtime/bnd.bnd b/org.argeo.slc.runtime/bnd.bnd
index c035eedc1..ea12318c6 100644
--- a/org.argeo.slc.runtime/bnd.bnd
+++ b/org.argeo.slc.runtime/bnd.bnd
@@ -1,3 +1,3 @@
-Import-Package: org.argeo.slc.deploy,\
-org.apache.commons.logging,\
+Import-Package: \
+org.argeo.slc.deploy,\
 *
\ No newline at end of file
-- 
2.30.2