From 99e83d6a8d55e291039fb50a464dc7434d48458d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 20 Jul 2022 11:39:17 +0200
Subject: [PATCH] Move CMS file utilities to a dedicated package

---
 org.argeo.cms.cli/src/org/argeo/cms/cli/FileSync.java         | 4 ++--
 .../org/argeo/cms/{acr/fs => file}/BasicSyncFileVisitor.java  | 2 +-
 .../src/org/argeo/cms/{acr/fs => file}/FsSyncUtils.java       | 2 +-
 .../src/org/argeo/cms/{acr/fs => file}/PathSync.java          | 2 +-
 .../src/org/argeo/cms/{acr/fs => file}/SyncFileVisitor.java   | 2 +-
 .../src/org/argeo/cms/{acr/fs => file}/SyncResult.java        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename org.argeo.cms/src/org/argeo/cms/{acr/fs => file}/BasicSyncFileVisitor.java (99%)
 rename org.argeo.cms/src/org/argeo/cms/{acr/fs => file}/FsSyncUtils.java (98%)
 rename org.argeo.cms/src/org/argeo/cms/{acr/fs => file}/PathSync.java (98%)
 rename org.argeo.cms/src/org/argeo/cms/{acr/fs => file}/SyncFileVisitor.java (95%)
 rename org.argeo.cms/src/org/argeo/cms/{acr/fs => file}/SyncResult.java (98%)

diff --git a/org.argeo.cms.cli/src/org/argeo/cms/cli/FileSync.java b/org.argeo.cms.cli/src/org/argeo/cms/cli/FileSync.java
index ccd092430..dc4c689d0 100644
--- a/org.argeo.cms.cli/src/org/argeo/cms/cli/FileSync.java
+++ b/org.argeo.cms.cli/src/org/argeo/cms/cli/FileSync.java
@@ -11,8 +11,8 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.argeo.api.cli.CommandArgsException;
 import org.argeo.api.cli.DescribedCommand;
-import org.argeo.cms.acr.fs.PathSync;
-import org.argeo.cms.acr.fs.SyncResult;
+import org.argeo.cms.file.PathSync;
+import org.argeo.cms.file.SyncResult;
 
 public class FileSync implements DescribedCommand<SyncResult<Path>> {
 	final static Option deleteOption = Option.builder().longOpt("delete").desc("delete from target").build();
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/BasicSyncFileVisitor.java b/org.argeo.cms/src/org/argeo/cms/file/BasicSyncFileVisitor.java
similarity index 99%
rename from org.argeo.cms/src/org/argeo/cms/acr/fs/BasicSyncFileVisitor.java
rename to org.argeo.cms/src/org/argeo/cms/file/BasicSyncFileVisitor.java
index 7041c75d8..ac81329a9 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/BasicSyncFileVisitor.java
+++ b/org.argeo.cms/src/org/argeo/cms/file/BasicSyncFileVisitor.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.acr.fs;
+package org.argeo.cms.file;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsSyncUtils.java b/org.argeo.cms/src/org/argeo/cms/file/FsSyncUtils.java
similarity index 98%
rename from org.argeo.cms/src/org/argeo/cms/acr/fs/FsSyncUtils.java
rename to org.argeo.cms/src/org/argeo/cms/file/FsSyncUtils.java
index c45e66c3a..68eb5abdc 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsSyncUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/file/FsSyncUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.acr.fs;
+package org.argeo.cms.file;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/PathSync.java b/org.argeo.cms/src/org/argeo/cms/file/PathSync.java
similarity index 98%
rename from org.argeo.cms/src/org/argeo/cms/acr/fs/PathSync.java
rename to org.argeo.cms/src/org/argeo/cms/file/PathSync.java
index 427044e9a..dc26aa28b 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/PathSync.java
+++ b/org.argeo.cms/src/org/argeo/cms/file/PathSync.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.acr.fs;
+package org.argeo.cms.file;
 
 import java.net.URI;
 import java.nio.file.FileSystems;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/SyncFileVisitor.java b/org.argeo.cms/src/org/argeo/cms/file/SyncFileVisitor.java
similarity index 95%
rename from org.argeo.cms/src/org/argeo/cms/acr/fs/SyncFileVisitor.java
rename to org.argeo.cms/src/org/argeo/cms/file/SyncFileVisitor.java
index 2a372878c..a69d2bf5e 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/SyncFileVisitor.java
+++ b/org.argeo.cms/src/org/argeo/cms/file/SyncFileVisitor.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.acr.fs;
+package org.argeo.cms.file;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/SyncResult.java b/org.argeo.cms/src/org/argeo/cms/file/SyncResult.java
similarity index 98%
rename from org.argeo.cms/src/org/argeo/cms/acr/fs/SyncResult.java
rename to org.argeo.cms/src/org/argeo/cms/file/SyncResult.java
index 709b485ff..35ab3f96a 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/SyncResult.java
+++ b/org.argeo.cms/src/org/argeo/cms/file/SyncResult.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.acr.fs;
+package org.argeo.cms.file;
 
 import java.time.Instant;
 import java.util.Set;
-- 
2.30.2