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 {
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;
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. */
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 {
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 {
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 {
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;
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;