From: Mathieu Date: Sat, 5 Nov 2022 06:52:49 +0000 (+0100) Subject: Adapt to massive package refactoring in Argeo Commons X-Git-Tag: v2.3.11~6 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=bd9756781470325ebabc8010358f5195c332b570;p=gpl%2Fargeo-jcr.git Adapt to massive package refactoring in Argeo Commons --- diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/CmsJcrUtils.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/CmsJcrUtils.java index 7fde177..1b94623 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/CmsJcrUtils.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/CmsJcrUtils.java @@ -18,8 +18,8 @@ import javax.security.auth.login.LoginException; import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsConstants; +import org.argeo.cms.util.CurrentSubject; import org.argeo.jcr.JcrUtils; -import org.argeo.util.CurrentSubject; /** Utilities related to Argeo model in JCR */ public class CmsJcrUtils { diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java index 17625f5..ff117e3 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/JcrKeyring.java @@ -28,11 +28,11 @@ import javax.jcr.query.Query; import org.apache.commons.io.IOUtils; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.keyring.PBEKeySpecCallback; +import org.argeo.cms.AbstractKeyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.jcr.CmsJcrUtils; -import org.argeo.cms.security.AbstractKeyring; -import org.argeo.cms.security.PBEKeySpecCallback; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryContextsFactory.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryContextsFactory.java index f3a099b..791b8a2 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryContextsFactory.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryContextsFactory.java @@ -20,7 +20,7 @@ import org.argeo.cms.CmsDeployProperty; import org.argeo.cms.internal.jcr.RepoConf; import org.argeo.cms.internal.jcr.RepositoryBuilder; import org.argeo.cms.jcr.internal.osgi.CmsJcrActivator; -import org.argeo.util.LangUtils; +import org.argeo.cms.util.LangUtils; import org.osgi.service.cm.ManagedServiceFactory; /** A {@link ManagedServiceFactory} creating or referencing JCR repositories. */ diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/CsvTabularWriter.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/CsvTabularWriter.java index ccd543f..821212e 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/CsvTabularWriter.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/CsvTabularWriter.java @@ -2,8 +2,8 @@ package org.argeo.cms.jcr.tabular; import java.io.OutputStream; -import org.argeo.cms.tabular.TabularWriter; -import org.argeo.util.CsvWriter; +import org.argeo.api.acr.tabular.TabularWriter; +import org.argeo.cms.util.CsvWriter; /** Write tabular content in a stream as CSV. Wraps a {@link CsvWriter}. */ public class CsvTabularWriter implements TabularWriter { diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularRowIterator.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularRowIterator.java index d1d9b58..0d589b1 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularRowIterator.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularRowIterator.java @@ -13,13 +13,13 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; +import org.argeo.api.acr.tabular.ArrayTabularRow; +import org.argeo.api.acr.tabular.TabularColumn; +import org.argeo.api.acr.tabular.TabularRow; +import org.argeo.api.acr.tabular.TabularRowIterator; import org.argeo.cms.ArgeoTypes; -import org.argeo.cms.tabular.ArrayTabularRow; -import org.argeo.cms.tabular.TabularColumn; -import org.argeo.cms.tabular.TabularRow; -import org.argeo.cms.tabular.TabularRowIterator; +import org.argeo.cms.util.CsvParser; import org.argeo.jcr.JcrException; -import org.argeo.util.CsvParser; /** Iterates over the rows of a {@link ArgeoTypes#ARGEO_TABLE} node. */ public class JcrTabularRowIterator implements TabularRowIterator { diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularWriter.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularWriter.java index cc3e0d7..b4ba65b 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularWriter.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/tabular/JcrTabularWriter.java @@ -12,12 +12,12 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; +import org.argeo.api.acr.tabular.TabularColumn; +import org.argeo.api.acr.tabular.TabularWriter; import org.argeo.cms.ArgeoTypes; -import org.argeo.cms.tabular.TabularColumn; -import org.argeo.cms.tabular.TabularWriter; +import org.argeo.cms.util.CsvWriter; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; -import org.argeo.util.CsvWriter; /** Write / reference tabular content in a JCR repository. */ public class JcrTabularWriter implements TabularWriter { diff --git a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java index 977adac..3eef961 100644 --- a/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java +++ b/org.argeo.cms.jcr/src/org/argeo/maintenance/AbstractMaintenanceService.java @@ -10,13 +10,13 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; +import org.argeo.api.acr.ldap.Distinguished; import org.argeo.api.acr.spi.ProvidedRepository; import org.argeo.api.cms.CmsLog; +import org.argeo.api.cms.transaction.WorkTransaction; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; -import org.argeo.util.naming.Distinguished; -import org.argeo.util.transaction.WorkTransaction; import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin; diff --git a/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java b/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java index e65e46a..df2618c 100644 --- a/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java +++ b/org.argeo.cms.jcr/src/org/argeo/maintenance/SimpleRoleRegistration.java @@ -8,7 +8,7 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import org.argeo.api.cms.CmsLog; -import org.argeo.util.transaction.WorkTransaction; +import org.argeo.api.cms.transaction.WorkTransaction; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.UserAdmin;