From d169026cb1939009fd90ac46a11f480cb3d803c0 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 5 Dec 2021 08:18:43 +0100
Subject: [PATCH] Move Eclipse components which are JCR specific.

---
 org.argeo.cms.ui/pom.xml                                     | 5 +++++
 .../argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java    | 0
 .../src/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java   | 0
 .../org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java   | 0
 .../src/org/argeo/eclipse/ui/jcr}/EclipseJcrMonitor.java     | 2 +-
 .../src/org/argeo/eclipse/ui/jcr/JcrUiUtils.java             | 0
 .../org/argeo/eclipse/ui/jcr/NodeColumnLabelProvider.java    | 0
 .../src/org/argeo/eclipse/ui/jcr/NodeElement.java            | 0
 .../src/org/argeo/eclipse/ui/jcr/NodeElementComparer.java    | 0
 .../src/org/argeo/eclipse/ui/jcr/NodesWrapper.java           | 0
 .../org/argeo/eclipse/ui/jcr/QueryTableContentProvider.java  | 0
 .../org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java  | 0
 .../org/argeo/eclipse/ui/jcr/VersionColumnLabelProvider.java | 0
 .../argeo/eclipse/ui/jcr/VersionHistoryContentProvider.java  | 0
 .../src/org/argeo/eclipse/ui/jcr/WrappedNode.java            | 0
 .../org/argeo/eclipse/ui/jcr/lists/JcrColumnDefinition.java  | 0
 .../org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java | 0
 .../org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java  | 0
 .../eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java     | 0
 .../eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java      | 0
 .../src/org/argeo/eclipse/ui/jcr/lists/package-info.java     | 0
 .../src/org/argeo/eclipse/ui/jcr/package-info.java           | 0
 .../src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java   | 0
 .../org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java    | 0
 .../org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java    | 0
 .../argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java | 0
 .../src/org/argeo/eclipse/ui/jcr/util/package-info.java      | 0
 org.argeo.cms/build.properties                               | 1 -
 org.argeo.eclipse.ui/bnd.bnd                                 | 3 +--
 org.argeo.eclipse.ui/pom.xml                                 | 2 +-
 30 files changed, 8 insertions(+), 5 deletions(-)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui/src/org/argeo/eclipse/ui => org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr}/EclipseJcrMonitor.java (96%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/JcrUiUtils.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/NodeColumnLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/NodeElement.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/NodeElementComparer.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/NodesWrapper.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/QueryTableContentProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/VersionColumnLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/VersionHistoryContentProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/WrappedNode.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/lists/JcrColumnDefinition.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/lists/package-info.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/package-info.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java (100%)
 rename {org.argeo.eclipse.ui => org.argeo.cms.ui}/src/org/argeo/eclipse/ui/jcr/util/package-info.java (100%)

diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml
index 60eb6203f..d2dd775e0 100644
--- a/org.argeo.cms.ui/pom.xml
+++ b/org.argeo.cms.ui/pom.xml
@@ -16,6 +16,11 @@
 			<artifactId>org.argeo.cms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.jcr</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
 		<!-- Specific -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseJcrMonitor.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java
similarity index 96%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseJcrMonitor.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java
index ffc50adad..b83aaa25a 100644
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseJcrMonitor.java
+++ b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/EclipseJcrMonitor.java
@@ -1,4 +1,4 @@
-package org.argeo.eclipse.ui;
+package org.argeo.eclipse.ui.jcr;
 
 import org.argeo.jcr.JcrMonitor;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/JcrUiUtils.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/JcrUiUtils.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/JcrUiUtils.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/JcrUiUtils.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodeColumnLabelProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodeColumnLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodeColumnLabelProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodeColumnLabelProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodeElement.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodeElement.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodeElement.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodeElement.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodeElementComparer.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodesWrapper.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodesWrapper.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/NodesWrapper.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/NodesWrapper.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/QueryTableContentProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/QueryTableContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/QueryTableContentProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/QueryTableContentProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/VersionColumnLabelProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/VersionColumnLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/VersionColumnLabelProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/VersionColumnLabelProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/VersionHistoryContentProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/VersionHistoryContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/VersionHistoryContentProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/VersionHistoryContentProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/WrappedNode.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/WrappedNode.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/WrappedNode.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/WrappedNode.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/JcrColumnDefinition.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/JcrColumnDefinition.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/JcrColumnDefinition.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/JcrColumnDefinition.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/package-info.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/package-info.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/lists/package-info.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/lists/package-info.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/package-info.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/package-info.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/package-info.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/package-info.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/JcrFileProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/JcrItemsComparator.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/NodeViewerComparer.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/SingleSessionFileProvider.java
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/package-info.java b/org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/package-info.java
similarity index 100%
rename from org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/util/package-info.java
rename to org.argeo.cms.ui/src/org/argeo/eclipse/ui/jcr/util/package-info.java
diff --git a/org.argeo.cms/build.properties b/org.argeo.cms/build.properties
index 55f4d9ae5..c5d6b5045 100644
--- a/org.argeo.cms/build.properties
+++ b/org.argeo.cms/build.properties
@@ -6,5 +6,4 @@ bin.includes = META-INF/,\
 source.. = src/,\
            ext/test/
 additional.bundles = org.apache.jackrabbit.data,\
-                     org.argeo.jcr,\
                      org.junit
diff --git a/org.argeo.eclipse.ui/bnd.bnd b/org.argeo.eclipse.ui/bnd.bnd
index b836fc0e9..ad8e58178 100644
--- a/org.argeo.eclipse.ui/bnd.bnd
+++ b/org.argeo.eclipse.ui/bnd.bnd
@@ -1,5 +1,4 @@
-Import-Package: javax.jcr.nodetype,\
-				org.eclipse.swt,\
+Import-Package: org.eclipse.swt,\
 				org.eclipse.jface.window,\
 				org.eclipse.core.commands.common,\
 				*
diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 1574da881..9a97ad070 100644
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -17,7 +17,7 @@
 <!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.jcr</artifactId>
+			<artifactId>org.argeo.cms.jcr</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
-- 
2.30.2