From 1511a0ef2114a419fde1c5877b10bcab73b05b08 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 5 Dec 2021 08:46:43 +0100 Subject: [PATCH] Adapt to changes in Argeo Commons. --- cms/org.argeo.cms.integration/pom.xml | 2 +- .../slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java | 2 +- .../argeo/slc/client/ui/dist/commands/CopyWorkspace.java | 2 +- .../argeo/slc/client/ui/dist/commands/MergeWorkspaces.java | 2 +- .../slc/client/ui/dist/commands/NormalizeDistribution.java | 2 +- .../slc/client/ui/dist/commands/NormalizeWorkspace.java | 2 +- .../slc/client/ui/dist/editors/DistWkspSearchPage.java | 2 +- .../org/argeo/slc/client/ui/dist/wizards/FetchWizard.java | 2 +- .../slc/client/ui/dist/wizards/GenerateBinariesWizard.java | 2 +- legacy/org.argeo.slc.spring/pom.xml | 2 +- legacy/pom.xml | 6 +++--- org.argeo.slc.factory/pom.xml | 2 ++ org.argeo.slc.jcr/pom.xml | 2 +- org.argeo.slc.repo/pom.xml | 2 +- .../org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java | 3 ++- 15 files changed, 19 insertions(+), 16 deletions(-) diff --git a/cms/org.argeo.cms.integration/pom.xml b/cms/org.argeo.cms.integration/pom.xml index d1b1080c0..82dc5f84c 100644 --- a/cms/org.argeo.cms.integration/pom.xml +++ b/cms/org.argeo.cms.integration/pom.xml @@ -16,7 +16,7 @@ org.argeo.commons - org.argeo.maintenance + org.argeo.cms.jcr ${version.argeo-commons} 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 7d26f9055..27ed484ae 100644 --- 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 4abdfab2d..87db6674b 100644 --- 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 70c3d7a12..6a62a62ee 100644 --- 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 e35b9bc23..2b9b2d05c 100644 --- 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 e5ed4d4e1..73261fed2 100644 --- 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 1a959a511..167cb5a05 100644 --- 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 888478dd2..272acbc28 100644 --- 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 1f353e00e..3fbbb2869 100644 --- 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 fc025e6d6..9cd31ff0a 100644 --- a/legacy/org.argeo.slc.spring/pom.xml +++ b/legacy/org.argeo.slc.spring/pom.xml @@ -27,7 +27,7 @@ org.argeo.commons - org.argeo.jcr + org.argeo.cms.jcr ${version.argeo-commons} diff --git a/legacy/pom.xml b/legacy/pom.xml index 35bfc02d4..26441ec41 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -36,9 +36,9 @@ lib - org.argeo.slc.demo.ant - org.argeo.slc.demo.basic - org.argeo.slc.demo.minimal + + + dep diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml index dadb1c73a..87b399676 100644 --- a/org.argeo.slc.factory/pom.xml +++ b/org.argeo.slc.factory/pom.xml @@ -15,6 +15,8 @@ org.argeo.slc.runtime 2.3-SNAPSHOT + + org.argeo.slc org.argeo.slc.repo diff --git a/org.argeo.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml index 0212f04db..c3638c2d8 100644 --- a/org.argeo.slc.jcr/pom.xml +++ b/org.argeo.slc.jcr/pom.xml @@ -39,7 +39,7 @@ org.argeo.commons - org.argeo.jcr + org.argeo.cms.jcr ${version.argeo-commons} diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml index 200b1161e..54a7bf3c4 100644 --- a/org.argeo.slc.repo/pom.xml +++ b/org.argeo.slc.repo/pom.xml @@ -19,7 +19,7 @@ org.argeo.commons - org.argeo.jcr + org.argeo.cms.jcr ${version.argeo-commons} 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 7e4a32e0e..e199fcc5a 100644 --- 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() { -- 2.39.2