Massive Argeo APIs refactoring

diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
index ede744722814360b2a740abbcb0b5e735368c42b..57901c4fe35f5a42f17362fed7629ade6567bc46 100644 (file)
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
@@ -1,6 +1,6 @@
 package org.argeo.entity;
 
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
 
 /** Constants used to name entity structures. */
 public interface EntityNames {

diff --git a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
index 00bcd7068af1ef185d427d478451418db67a19ea..e75a9160e5c6cbcf844873fd04ba3842d3fafd43 100644 (file)
--- a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
+++ b/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
@@ -5,8 +5,7 @@ import java.util.List;
 
 import javax.jcr.Item;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.MouseDoubleClick;
 import org.argeo.cms.swt.MouseDown;
@@ -32,7 +31,7 @@ import org.eclipse.swt.widgets.ToolItem;
 /** {@link EditablePart} for multiple terms. */
 public class MultiTermsPart extends AbstractTermsPart {
        private static final long serialVersionUID = -4961135649177920808L;
-       private final static Log log = LogFactory.getLog(MultiTermsPart.class);
+       private final static CmsLog log = CmsLog.getLog(MultiTermsPart.class);
 
        public MultiTermsPart(Composite parent, int style, Item item, TermsManager termsManager, String typology) {
                super(parent, style, item, termsManager, typology);

diff --git a/org.argeo.geo.ui/bnd.bnd b/org.argeo.geo.ui/bnd.bnd
index 4fdb49b7f0ffe471feb01190660d52655e11ae64..7e5ce4841293e1d8ca213654348d364441e3d3d5 100644 (file)
--- a/org.argeo.geo.ui/bnd.bnd
+++ b/org.argeo.geo.ui/bnd.bnd
@@ -3,7 +3,6 @@ javax.jcr.nodetype,\
 org.osgi.service.event,\
 com.fasterxml.jackson.core,\
 org.argeo.suite.ui,\
-org.argeo.api,\
 org.eclipse.swt,\
 org.eclipse.jface.viewers,\
 org.osgi.framework,\

diff --git a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java b/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
index 4803a8681ed33a55a7edbbfc707321646fa055e9..dac7bea8da28265ce70cc69ff02dde7a49a222a1 100644 (file)
--- a/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
+++ b/org.argeo.geo.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
@@ -13,10 +13,9 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.entity.EntityNames;
 import org.argeo.entity.EntityType;
@@ -31,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
 public class OpenLayersMap extends Composite {
        private static final long serialVersionUID = 1055893020490283622L;
 
-       private final static Log log = LogFactory.getLog(OpenLayersMap.class);
+       private final static CmsLog log = CmsLog.getLog(OpenLayersMap.class);
 
        private Browser browser;
        private boolean renderCompleted = false;
@@ -269,7 +268,7 @@ public class OpenLayersMap extends Composite {
                        String path = arguments[0].toString();
                        Map<String, Object> properties = new HashMap<>();
                        properties.put(SuiteEvent.NODE_PATH, path);
-                       properties.put(SuiteEvent.WORKSPACE, NodeConstants.SYS_WORKSPACE);
+                       properties.put(SuiteEvent.WORKSPACE, CmsConstants.SYS_WORKSPACE);
                        cmsView.sendEvent(SuiteEvent.refreshPart.topic(), properties);
                        return null;
                }

diff --git a/org.argeo.library.ui/bnd.bnd b/org.argeo.library.ui/bnd.bnd
index 71f461825e79a55a3cb6f9c218acc2bb0f5a966e..213c39c239e891c1c0fa605b41b7600917f15a1e 100644 (file)
--- a/org.argeo.library.ui/bnd.bnd
+++ b/org.argeo.library.ui/bnd.bnd
@@ -7,6 +7,5 @@ OSGI-INF/documentsFolder.xml
 Import-Package:\
 org.eclipse.swt,\
 javax.jcr.nodetype,\
-org.argeo.api,\
 org.argeo.suite.ui,\
 *
\ No newline at end of file

diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java
index 995d82bd832fe2e57110b59005afd4b95c996684..c9f4889592f8ef66822a3858199f4c20934ac42d 100644 (file)
--- a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java
+++ b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java
@@ -7,8 +7,7 @@ import java.nio.file.spi.FileSystemProvider;
 
 import javax.jcr.Node;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.fs.CmsFsUtils;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
@@ -29,7 +28,7 @@ import org.eclipse.swt.widgets.Label;
 public class DocumentsFileComposite extends Composite {
        private static final long serialVersionUID = -7567632342889241793L;
 
-       private final static Log log = LogFactory.getLog(DocumentsFileComposite.class);
+       private final static CmsLog log = CmsLog.getLog(DocumentsFileComposite.class);
 
        private final Node currentBaseContext;
 

diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java
index 6363d495e4fc082fc60d00255a173a81b0cb0b5f..b9709e69e45f99f0860496f6de270f7c5b8a53cd 100644 (file)
--- a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java
+++ b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java
@@ -13,8 +13,7 @@ import java.util.List;
 
 import javax.jcr.Node;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.fs.FileDrop;
 import org.argeo.cms.ui.fs.FsStyles;
@@ -59,7 +58,7 @@ import org.eclipse.swt.widgets.Text;
  * the middle and an overview at right hand side.
  */
 public class DocumentsFolderComposite extends Composite {
-       private final static Log log = LogFactory.getLog(DocumentsFolderComposite.class);
+       private final static CmsLog log = CmsLog.getLog(DocumentsFolderComposite.class);
        private static final long serialVersionUID = -40347919096946585L;
 
        private final Node currentBaseContext;

diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java
index a2b1ce3eb9ab72810976046d2226da1cf6df5167..b2483a9030c9385201ed1b12dbeb31f55ec6a550 100644 (file)
--- a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java
+++ b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java
@@ -8,8 +8,8 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
-import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.fs.CmsFsUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -34,7 +34,7 @@ public class DocumentsTreeUiProvider implements CmsUiProvider {
                FsTreeViewer fsTreeViewer = new FsTreeViewer(parent, SWT.NONE);
                fsTreeViewer.configureDefaultSingleColumnTable(500);
                CmsView cmsView = CmsSwtUtils.getCmsView(parent);
-               Node homeNode = CmsJcrUtils.getUserHome(cmsView.doAs(() -> Jcr.login(repository, NodeConstants.HOME_WORKSPACE)));
+               Node homeNode = CmsJcrUtils.getUserHome(cmsView.doAs(() -> Jcr.login(repository, CmsConstants.HOME_WORKSPACE)));
                parent.addDisposeListener((e1) -> Jcr.logout(homeNode));
                Path homePath = CmsFsUtils.getPath(nodeFileSystemProvider, homeNode);
                fsTreeViewer.addSelectionChangedListener((e) -> {

diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java
index b222e489d3fc02d08b0a9426b1bed1fc08ba14e4..9084e8608ff34292dbf88a970503ed92d780fd68 100644 (file)
--- a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java
+++ b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java
@@ -25,8 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.swt.dialogs.CmsFeedback;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -35,7 +34,7 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
 
 public class DocumentsUiService {
-       private final static Log log = LogFactory.getLog(DocumentsUiService.class);
+       private final static CmsLog log = CmsLog.getLog(DocumentsUiService.class);
 
        // Default known actions
        public final static String ACTION_ID_CREATE_FOLDER = "createFolder";

diff --git a/org.argeo.people.ui/bnd.bnd b/org.argeo.people.ui/bnd.bnd
index 1b92ebbbde79a8000f995d1ef0f1849ee6a663e4..474b365af48aefc635ac8b95b131187b67387ed9 100644 (file)
--- a/org.argeo.people.ui/bnd.bnd
+++ b/org.argeo.people.ui/bnd.bnd
@@ -2,7 +2,6 @@ Import-Package:\
 javax.jcr.nodetype,\
 org.osgi.service.event,\
 org.argeo.suite.ui,\
-org.argeo.api,\
 org.eclipse.swt,\
 org.eclipse.jface.viewers,\
 org.eclipse.jface.window,\

diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/PeopleEntryArea.java b/org.argeo.people.ui/src/org/argeo/people/ui/PeopleEntryArea.java
index 87a591ef8a2da019cd743e387e381c3a21c2a91b..1843ea8b49b001cc45d8b97614af5e864a8406e1 100644 (file)
--- a/org.argeo.people.ui/src/org/argeo/people/ui/PeopleEntryArea.java
+++ b/org.argeo.people.ui/src/org/argeo/people/ui/PeopleEntryArea.java
@@ -11,11 +11,11 @@ import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.dialogs.CmsWizardDialog;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.suite.SuiteRole;
 import org.argeo.suite.ui.SuiteEvent;
 import org.argeo.suite.ui.SuiteIcon;
 import org.argeo.suite.ui.dialogs.NewUserWizard;
+import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;

diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/PersonUiProvider.java b/org.argeo.people.ui/src/org/argeo/people/ui/PersonUiProvider.java
index e6ad48e919230ddee32a930d8ac2bc2067dac2c9..8a5476d56541cb9b407527c197d709b01ec00d02 100644 (file)
--- a/org.argeo.people.ui/src/org/argeo/people/ui/PersonUiProvider.java
+++ b/org.argeo.people.ui/src/org/argeo/people/ui/PersonUiProvider.java
@@ -11,9 +11,9 @@ import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.viewers.Section;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.suite.ui.SuiteMsg;
 import org.argeo.suite.ui.SuiteUiUtils;
+import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;

diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java b/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java
index f41317ff0efc837bd802e579a0e525ede5bb4bbd..07c326b9497b83aac68ef80db25a3277dd593748 100644 (file)
--- a/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java
+++ b/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java
@@ -11,9 +11,9 @@ import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.viewers.Section;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.suite.ui.SuiteMsg;
 import org.argeo.suite.ui.SuiteUiUtils;
+import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;

diff --git a/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java b/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java
index 909ea9a44d7b4668a027becb4c93078a97787916..6cb83d1d492198879fd96a07aa4086a0e24a51aa 100644 (file)
--- a/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java
+++ b/org.argeo.people.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java
@@ -11,11 +11,11 @@ import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.dialogs.CmsWizardDialog;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.suite.SuiteRole;
 import org.argeo.suite.ui.SuiteEvent;
 import org.argeo.suite.ui.SuiteIcon;
 import org.argeo.suite.ui.dialogs.NewUserWizard;
+import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;

diff --git a/org.argeo.publishing.ui/bnd.bnd b/org.argeo.publishing.ui/bnd.bnd
index 67c0dd9b22564304e83fa384fece0cef92130f00..6ee68f840337607608f5206b5fd0f7de0df379e4 100644 (file)
--- a/org.argeo.publishing.ui/bnd.bnd
+++ b/org.argeo.publishing.ui/bnd.bnd
@@ -3,7 +3,6 @@ org.osgi.service.http.context,\
 javax.jcr.nodetype,\
 org.osgi.service.event,\
 org.argeo.suite.ui,\
-org.argeo.api,\
 org.eclipse.swt,\
 org.eclipse.jface.viewers,\
 org.osgi.framework,\

diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java b/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
index 151bf10db690a0ae538e95ab061fc10d42996892..f4bf502069f9f71286c9f89d38cf9a339401a39c 100644 (file)
--- a/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
+++ b/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
@@ -15,8 +15,7 @@ import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.ValueFormatException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
@@ -25,7 +24,7 @@ import org.argeo.jcr.JcrxApi;
 
 /** Utilities around DocBook. */
 public class DbkUtils {
-       private final static Log log = LogFactory.getLog(DbkUtils.class);
+       private final static CmsLog log = CmsLog.getLog(DbkUtils.class);
 
        /** Get or add a DocBook element. */
        public static Node getOrAddDbk(Node parent, DbkType child) {

diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java b/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
index c1b2f5087c9ad75d6a4246127f8187c51b0b36b1..c9e21831bfb1a8865967a308bfcae5948bff93ca 100644 (file)
--- a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
+++ b/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
@@ -16,10 +16,9 @@ import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.Cms2DSize;
 import org.argeo.api.cms.CmsEditable;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.viewers.AbstractPageViewer;
 import org.argeo.cms.ui.viewers.EditablePart;
@@ -57,7 +56,7 @@ import org.eclipse.swt.widgets.Text;
 /** Base class for text viewers and editors. */
 public abstract class AbstractDbkViewer extends AbstractPageViewer implements KeyListener, Observer {
        private static final long serialVersionUID = -2401274679492339668L;
-       private final static Log log = LogFactory.getLog(AbstractDbkViewer.class);
+       private final static CmsLog log = CmsLog.getLog(AbstractDbkViewer.class);
 
        private final Section mainSection;
 

diff --git a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkVideo.java b/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkVideo.java
index a54dedb2369ed31a3f5440ed32e664e247aa29e4..ed7976a3fd6ef4ef0d0ca135ce979e1e8749e416 100644 (file)
--- a/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkVideo.java
+++ b/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkVideo.java
@@ -20,7 +20,7 @@ import org.argeo.docbook.DbkType;
 import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
-import org.argeo.naming.NamingUtils;
+import org.argeo.util.naming.NamingUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.events.SelectionEvent;

diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java b/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
index 15520e0149f0a4a3af947a20456c44ba277e2c27..464f0c93e0440526c61b4683b45069d95b2b47e7 100644 (file)
--- a/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
+++ b/org.argeo.publishing.ui/src/org/argeo/publishing/ui/PublishingApp.java
@@ -11,10 +11,9 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsApp;
 import org.argeo.api.cms.CmsUi;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.jcr.Jcr;
@@ -32,7 +31,7 @@ import org.osgi.service.event.EventHandler;
  * site.
  */
 public class PublishingApp extends AbstractCmsApp implements EventHandler {
-       private final static Log log = LogFactory.getLog(PublishingApp.class);
+       private final static CmsLog log = CmsLog.getLog(PublishingApp.class);
 
        private String pid;
        private String defaultThemeId;

diff --git a/org.argeo.suite.core/bnd.bnd b/org.argeo.suite.core/bnd.bnd
index 1b9efff2c6c14579fef4fb407ba8427e589387f9..8022cd26cdf58275c46bae03c41e96740e32f0bd 100644 (file)
--- a/org.argeo.suite.core/bnd.bnd
+++ b/org.argeo.suite.core/bnd.bnd
@@ -9,6 +9,5 @@ javax.transaction,\
 org.osgi.service.useradmin,\
 javax.jcr.nodetype,\
 javax.jcr.security,\
-org.argeo.api,\
 org.argeo.entity,\
 *
\ No newline at end of file

diff --git a/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java b/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java
index bfba46e449879f6cfa717daafc70d4d815c064a2..b3ba37dd5bc5b7dace916d4bc0d59ae8800a83d5 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java
@@ -2,15 +2,14 @@ package org.argeo.suite;
 
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 
 /**
  * A container for an object whose relevance can be ranked. Typically used in an
  * OSGi context with the service.ranking property.
  */
 public class RankedObject<T> {
-       private final static Log log = LogFactory.getLog(RankedObject.class);
+       private final static CmsLog log = CmsLog.getLog(RankedObject.class);
 
        private final static String SERVICE_RANKING = "service.ranking";
 //     private final static String SERVICE_ID = "service.id";

diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteRole.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteRole.java
index 382f50c171b88fc63ef340fd0a7cd01498fd1360..7f3af76ec9ab173d33e81f329a22c6398831dfc5 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/SuiteRole.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/SuiteRole.java
@@ -1,8 +1,8 @@
 package org.argeo.suite;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.naming.Distinguished;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.util.naming.Distinguished;
+import org.argeo.util.naming.LdapAttrs;
 
 /** Office specific roles used in the code */
 public enum SuiteRole implements Distinguished {
@@ -14,6 +14,6 @@ public enum SuiteRole implements Distinguished {
 
        public String dn() {
                return new StringBuilder(LdapAttrs.cn.name()).append("=").append(getRolePrefix()).append(".").append(name())
-                               .append(",").append(NodeConstants.ROLES_BASEDN).toString();
+                               .append(",").append(CmsConstants.ROLES_BASEDN).toString();
        }
 }

diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
index e67339182e34ba818ef293d99d5ac44b97894f3e..e6d4960ccce1b76afc52f34131b54c3855762064 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
@@ -11,13 +11,13 @@ import javax.jcr.security.Privilege;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.x500.X500Principal;
 
-import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.entity.EntityType;
 import org.argeo.jackrabbit.security.JackrabbitSecurityUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
 
 /** Utilities around the Argeo Suite APIs. */
 public class SuiteUtils {
@@ -43,7 +43,7 @@ public class SuiteUtils {
                                                Privilege.JCR_READ);
                                JcrUtils.addPrivilege(adminSession, userNode.getPath(), new X500Principal(userDn.toString()).getName(),
                                                Privilege.JCR_READ);
-                               JcrUtils.addPrivilege(adminSession, userNode.getPath(), NodeConstants.ROLE_USER_ADMIN,
+                               JcrUtils.addPrivilege(adminSession, userNode.getPath(), CmsConstants.ROLE_USER_ADMIN,
                                                Privilege.JCR_ALL);
                        } else {
                                userNode = usersBase.getNode(uid);

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java b/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java
index 5d76eb126ae5ec4c83cf21d7de33316e385d9c88..4cd05cfc92e903818e02ac2e6ff3127c795f4858 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java
@@ -11,15 +11,14 @@ import javax.jcr.ItemExistsException;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.maintenance.AbstractMaintenanceService;
 
 /** Base for custom initialisations. */
 public abstract class CustomMaintenanceService extends AbstractMaintenanceService {
-       private final static Log log = LogFactory.getLog(AbstractMaintenanceService.class);
+       private final static CmsLog log = CmsLog.getLog(AbstractMaintenanceService.class);
 
        protected List<String> getTypologies() {
                return new ArrayList<>();

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java
index b2173731da0edf0fc965ad6a51f627e64fcb25b9..ab2043fa3c816b6ac5690fc7e2aaff6bddf33c4a 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java
@@ -8,7 +8,7 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.Privilege;
 
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.maintenance.AbstractMaintenanceService;
@@ -31,7 +31,7 @@ public class SuiteMaintenanceService extends AbstractMaintenanceService {
 
        @Override
        public void configurePrivileges(Session adminSession) throws RepositoryException {
-               JcrUtils.addPrivilege(adminSession, EntityType.user.basePath(), NodeConstants.ROLE_USER_ADMIN,
+               JcrUtils.addPrivilege(adminSession, EntityType.user.basePath(), CmsConstants.ROLE_USER_ADMIN,
                                Privilege.JCR_ALL);
                //JcrUtils.addPrivilege(adminSession, "/", SuiteRole.coworker.dn(), Privilege.JCR_READ);
        }

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java
index ad4de57438e4b5a840f2e98d86905521bc0945de..41126c388f801ef9b1f27943b5b5461a226c0ec2 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java
@@ -10,7 +10,7 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.entity.EntityNames;
 import org.argeo.entity.EntityType;
@@ -29,7 +29,7 @@ public class SuiteTermsManager implements TermsManager {
        private Session adminSession;
 
        public void init() {
-               adminSession = CmsJcrUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
+               adminSession = CmsJcrUtils.openDataAdminSession(repository, CmsConstants.SYS_WORKSPACE);
        }
 
        @Override

diff --git a/org.argeo.suite.core/src/org/argeo/suite/util/XPathUtils.java b/org.argeo.suite.core/src/org/argeo/suite/util/XPathUtils.java
index 66d9aa063eb63e3e03f753b020e9b773e77cbaf6..df56d3fc31a083d6ccecf792e483311b2dea0738 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/util/XPathUtils.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/util/XPathUtils.java
@@ -9,13 +9,12 @@ import javax.jcr.Session;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.util.ISO9075;
+import org.argeo.api.cms.CmsLog;
 
 /** Ease XPath generation for JCR requests */
 public class XPathUtils {
-       private final static Log log = LogFactory.getLog(XPathUtils.class);
+       private final static CmsLog log = CmsLog.getLog(XPathUtils.class);
 
        private final static String QUERY_XPATH = "xpath";
 

diff --git a/org.argeo.suite.ui/bnd.bnd b/org.argeo.suite.ui/bnd.bnd
index 7785626947e966f37fdb8a1faaea3a38a856d91e..32f8bf8c55a71f4b3d49486eadc8f5023e4e9188 100644 (file)
--- a/org.argeo.suite.ui/bnd.bnd
+++ b/org.argeo.suite.ui/bnd.bnd
@@ -13,7 +13,6 @@ OSGI-INF/dashboard.xml,\
 OSGI-INF/dashboardLayer.xml
 
 Import-Package:\
-org.argeo.api,\
 org.argeo.cms.ui.widgets,\
 org.eclipse.swt,\
 org.osgi.framework,\

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
index fb0d19df6d1129b3fe5c623f6a8c2ce3bda6e73d..2eaba61ccc9b557f953310b134e980cc900c39b9 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
@@ -12,9 +12,8 @@ import java.util.TreeMap;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -33,7 +32,7 @@ import org.osgi.framework.wiring.BundleWiring;
 
 /** Side pane listing various perspectives. */
 public class DefaultLeadPane implements CmsUiProvider {
-       private final static Log log = LogFactory.getLog(DefaultLeadPane.class);
+       private final static CmsLog log = CmsLog.getLog(DefaultLeadPane.class);
 
        public static enum Property {
                defaultLayers, adminLayers;

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/EventRecorder.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/EventRecorder.java
index 4c928a921c2e98bd39bf0ef3b747e476490ea496..c578816777f3d7ae76b30deb2447ae676d00e5d2 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/EventRecorder.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/EventRecorder.java
@@ -1,13 +1,12 @@
 package org.argeo.suite.ui;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
 
 /** Record UI events. */
 public class EventRecorder implements EventHandler {
-       private final static Log log = LogFactory.getLog(EventRecorder.class);
+       private final static CmsLog log = CmsLog.getLog(EventRecorder.class);
 
        public void init() {
 

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index 8eb9ef4ebfa71aa4f80f5749b744afb408f6e508..118555a9db938d9efef3074c04a0fb3176b41b80 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -21,12 +21,11 @@ import javax.jcr.nodetype.NodeType;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsUi;
 import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.LocaleUtils;
@@ -53,7 +52,7 @@ import org.osgi.service.useradmin.User;
 
 /** The Argeo Suite App. */
 public class SuiteApp extends AbstractCmsApp implements EventHandler {
-       private final static Log log = LogFactory.getLog(SuiteApp.class);
+       private final static CmsLog log = CmsLog.getLog(SuiteApp.class);
 
        public final static String PUBLIC_BASE_PATH_PROPERTY = "publicBasePath";
        public final static String DEFAULT_UI_NAME_PROPERTY = "defaultUiName";

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
index a79d236b29842c3f38806336a40c6e59f36bdf55..dc2ef509b1161d00e203d75a5ca5871df7a31376 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
@@ -8,11 +8,10 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsUi;
 import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.Localized;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.jcr.Jcr;
@@ -23,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
 /** The view for the default ergonomics of Argeo Suite. */
 class SuiteUi extends Composite implements CmsUi {
        private static final long serialVersionUID = 6207018859086689108L;
-       private final static Log log = LogFactory.getLog(SuiteUi.class);
+       private final static CmsLog log = CmsLog.getLog(SuiteUi.class);
 
        private Localized title;
        private Composite header;
@@ -217,7 +216,7 @@ class SuiteUi extends Composite implements CmsUi {
 //
        synchronized void initSessions(Repository repository, String userDirPath) throws RepositoryException {
                this.sysSession = repository.login();
-               this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE);
+               this.homeSession = repository.login(CmsConstants.HOME_WORKSPACE);
                userDir = sysSession.getNode(userDirPath);
                addDisposeListener((e) -> {
                        Jcr.logout(sysSession);
@@ -236,9 +235,9 @@ class SuiteUi extends Composite implements CmsUi {
        Session getSession(String workspaceName) {
                if (workspaceName == null)
                        return sysSession;
-               if (NodeConstants.SYS_WORKSPACE.equals(workspaceName))
+               if (CmsConstants.SYS_WORKSPACE.equals(workspaceName))
                        return sysSession;
-               else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName))
+               else if (CmsConstants.HOME_WORKSPACE.equals(workspaceName))
                        return homeSession;
                else
                        throw new IllegalArgumentException("Unknown workspace " + workspaceName);

diff --git a/org.argeo.support.odk/bnd.bnd b/org.argeo.support.odk/bnd.bnd
index fa581ce68696f525a273ab9ce6123b5dd4987971..3de91584a6aac2f93e86dd93e8a23fa5582db380 100644 (file)
--- a/org.argeo.support.odk/bnd.bnd
+++ b/org.argeo.support.odk/bnd.bnd
@@ -14,6 +14,5 @@ OSGI-INF/odkManifestServlet.xml
 
 Import-Package:\
 org.osgi.service.http.context,\
-org.argeo.api,\
 javax.jcr.nodetype,\
 *

diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/OdkUtils.java b/org.argeo.support.odk/src/org/argeo/support/odk/OdkUtils.java
index f4bb9368af52c5130e1812afbfdbff574f598f14..940103f18a5839076f23f6d39160c6c04a5bdd16 100644 (file)
--- a/org.argeo.support.odk/src/org/argeo/support/odk/OdkUtils.java
+++ b/org.argeo.support.odk/src/org/argeo/support/odk/OdkUtils.java
@@ -20,8 +20,7 @@ import javax.jcr.query.QueryResult;
 import javax.jcr.query.Row;
 import javax.jcr.query.RowIterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.entity.EntityMimeType;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
@@ -31,7 +30,7 @@ import org.argeo.util.DigestUtils;
 
 /** Utilities around ODK. */
 public class OdkUtils {
-       private final static Log log = LogFactory.getLog(OdkUtils.class);
+       private final static CmsLog log = CmsLog.getLog(OdkUtils.class);
 
        public static Node loadOdkForm(Node formBase, String name, InputStream in, InputStream... additionalNodes)
                        throws RepositoryException, IOException {

diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
index 11a9ccbf47e5f2fc30a23cfd5728a6236c2a3a72..16e525aa62c40248accd11cf9c426604a8088879 100644 (file)
--- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
+++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
@@ -19,9 +19,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.entity.EntityType;
@@ -34,7 +33,7 @@ import org.argeo.support.odk.OrxManifestName;
 /** Lists available forms. */
 public class OdkFormListServlet extends HttpServlet {
        private static final long serialVersionUID = 2706191315048423321L;
-       private final static Log log = LogFactory.getLog(OdkFormListServlet.class);
+       private final static CmsLog log = CmsLog.getLog(OdkFormListServlet.class);
 
        private Set<OdkForm> odkForms = Collections.synchronizedSet(new HashSet<>());
 
@@ -55,7 +54,7 @@ public class OdkFormListServlet extends HttpServlet {
 
                String pathInfo = req.getPathInfo();
 
-               Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE),
+               Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, CmsConstants.SYS_WORKSPACE),
                                new ServletHttpRequest(req));
 //             session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
                Writer writer = resp.getWriter();

diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
index 1d40743dc81c238b71b2f1b93d4827b876e83ea7..9e0c8003e4a3b846848353f2ab89a7b72c47f0bf 100644 (file)
--- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
+++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
@@ -21,9 +21,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.auth.RemoteAuthRequest;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
@@ -37,7 +36,7 @@ import org.argeo.support.xforms.FormSubmissionListener;
 /** Receives a form submission. */
 public class OdkSubmissionServlet extends HttpServlet {
        private static final long serialVersionUID = 7834401404691302385L;
-       private final static Log log = LogFactory.getLog(OdkSubmissionServlet.class);
+       private final static CmsLog log = CmsLog.getLog(OdkSubmissionServlet.class);
 
        private final static String XML_SUBMISSION_FILE = "xml_submission_file";