Adapt to changes in Argeo Commons.

diff --git a/cms/org.argeo.cms.integration/pom.xml b/cms/org.argeo.cms.integration/pom.xml
index d1b1080c056c459db3eecb8612da919c24d0f9a8..82dc5f84ce69ae7e33b3fc74294b70afd779a7b8 100644 (file)
--- a/cms/org.argeo.cms.integration/pom.xml
+++ b/cms/org.argeo.cms.integration/pom.xml
@@ -16,7 +16,7 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.maintenance</artifactId>
+                       <artifactId>org.argeo.cms.jcr</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
        </dependencies>

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
index 7d26f905544974820d2a1f909d949e467b7f7fa2..27ed484ae4243025f262811fbd0b93326aee518a 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java
@@ -9,7 +9,7 @@ import javax.jcr.security.Privilege;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.workbench.util.PrivilegedJob;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
index 4abdfab2d0d4f80ee9de58e2c8b010149dd09f1d..87db6674b512276b10a4ad2fb53443f34ddae54a 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java
@@ -12,7 +12,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ui.workbench.util.PrivilegedJob;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
index 70c3d7a1283ed23e2b1a206794881aac7161ae10..6a62a62ee3ff82aaca30393ed4ee9707e301f868 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java
@@ -13,7 +13,7 @@ import javax.jcr.query.QueryResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.security.Keyring;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
index e35b9bc2366b652ecc136d53d1d15c2819d73679..2b9b2d05c102fd5c7d98eee3b0645f30cbf52eaa 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
@@ -17,7 +17,7 @@ import javax.jcr.util.TraversingItemVisitor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.security.Keyring;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.NameVersion;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
index e5ed4d4e109aca40be811f0c11340e4f55eafe8a..73261fed251a9de4061b34e1d46cb8695767ca74 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
@@ -15,7 +15,7 @@ import javax.jcr.util.TraversingItemVisitor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.security.Keyring;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
index 1a959a511b8ca9e804a754581837a4cfcadbaa67..167cb5a05e8f602d316e3daca73c60760d011104 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
@@ -24,7 +24,7 @@ import javax.jcr.query.qom.StaticOperand;
 
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.ui.workbench.util.PrivilegedJob;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
index 888478dd20c4d09f90ec6bc362126b942b1e4313..272acbc2896b04c1740c3eda70f62b4c5ab6c381 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java
@@ -18,7 +18,7 @@ import org.argeo.api.security.Keyring;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ArgeoTypes;
 import org.argeo.cms.ui.workbench.util.PrivilegedJob;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;

diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
index 1f353e00ef8aa7ce986d98ec7dae933c0577b282..3fbbb2869ce91d22f19782b79228076b96725426 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
@@ -11,7 +11,7 @@ import javax.jcr.Session;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.workbench.util.PrivilegedJob;
-import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;

diff --git a/legacy/org.argeo.slc.spring/pom.xml b/legacy/org.argeo.slc.spring/pom.xml
index fc025e6d6ab081c3d175ef686b6cb968155c117b..9cd31ff0a3d3e716158d2c60f2691519f3185960 100644 (file)
--- a/legacy/org.argeo.slc.spring/pom.xml
+++ b/legacy/org.argeo.slc.spring/pom.xml
@@ -27,7 +27,7 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.jcr</artifactId>
+                       <artifactId>org.argeo.cms.jcr</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
 

diff --git a/legacy/pom.xml b/legacy/pom.xml
index 35bfc02d4080522f758fa7a842e2bf077a2aeee0..26441ec41ba0214f24b262dc14c7a84a64f1bb08 100644 (file)
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -36,9 +36,9 @@
                <module>lib</module>
 
                <!-- Spring-based modules demo -->
-               <module>org.argeo.slc.demo.ant</module>
-               <module>org.argeo.slc.demo.basic</module>
-               <module>org.argeo.slc.demo.minimal</module>
+<!--           <module>org.argeo.slc.demo.ant</module> -->
+<!--           <module>org.argeo.slc.demo.basic</module> -->
+<!--           <module>org.argeo.slc.demo.minimal</module> -->
 
                <module>dep</module>
        </modules>

diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml
index dadb1c73af6948c5e1168283e1c9cbba268c036b..87b399676b0b9c83de1b76d4204aaae7ae6901ef 100644 (file)
--- a/org.argeo.slc.factory/pom.xml
+++ b/org.argeo.slc.factory/pom.xml
@@ -15,6 +15,8 @@
                        <artifactId>org.argeo.slc.runtime</artifactId>
                        <version>2.3-SNAPSHOT</version>
                </dependency>
+               
+               
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>

diff --git a/org.argeo.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml
index 0212f04db88c5ddc1f0656f1ba9861f5a289dfd4..c3638c2d8c97ae03a1c89e5e4b8436d734b0aa48 100644 (file)
--- a/org.argeo.slc.jcr/pom.xml
+++ b/org.argeo.slc.jcr/pom.xml
@@ -39,7 +39,7 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.jcr</artifactId>
+                       <artifactId>org.argeo.cms.jcr</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
 

diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml
index 200b1161e792e619d50aed3e1f4319d5732d0872..54a7bf3c442dc778674aa507b1b06b86d908a44d 100644 (file)
--- a/org.argeo.slc.repo/pom.xml
+++ b/org.argeo.slc.repo/pom.xml
@@ -19,7 +19,7 @@
                <!-- Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.jcr</artifactId>
+                       <artifactId>org.argeo.cms.jcr</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java
index 7e4a32e0e91c7feb4e2fadb81d60cc74d4011ba6..e199fcc5ac2ccd7efe14dccdb162446b6a28d2cf 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -42,7 +43,7 @@ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements A
        public void init() {
                if (log.isDebugEnabled())
                        log.debug(describe());
-//             migrateTov2(Paths.get(System.getProperty("user.home"), "dev/git/gpl/argeo-tp/argeo-tp"));
+               migrateTov2(Paths.get(System.getProperty("user.home"), "dev/git/unstable/argeo-tp/argeo-tp"));
        }
 
        public void destroy() {