package org.argeo.entity;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
/** Constants used to name entity structures. */
public interface EntityNames {
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;
/** {@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);
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,\
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;
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;
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;
}
Import-Package:\
org.eclipse.swt,\
javax.jcr.nodetype,\
-org.argeo.api,\
org.argeo.suite.ui,\
*
\ No newline at end of file
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;
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;
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;
* 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;
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;
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) -> {
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;
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";
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,\
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;
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;
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;
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;
javax.jcr.nodetype,\
org.osgi.service.event,\
org.argeo.suite.ui,\
-org.argeo.api,\
org.eclipse.swt,\
org.eclipse.jface.viewers,\
org.osgi.framework,\
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;
/** 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) {
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;
/** 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;
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;
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;
* 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;
org.osgi.service.useradmin,\
javax.jcr.nodetype,\
javax.jcr.security,\
-org.argeo.api,\
org.argeo.entity,\
*
\ No newline at end of file
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";
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 {
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();
}
}
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 {
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);
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<>();
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;
@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);
}
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;
private Session adminSession;
public void init() {
- adminSession = CmsJcrUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
+ adminSession = CmsJcrUtils.openDataAdminSession(repository, CmsConstants.SYS_WORKSPACE);
}
@Override
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";
OSGI-INF/dashboardLayer.xml
Import-Package:\
-org.argeo.api,\
org.argeo.cms.ui.widgets,\
org.eclipse.swt,\
org.osgi.framework,\
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;
/** 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;
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() {
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;
/** 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";
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;
/** 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;
//
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);
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);
Import-Package:\
org.osgi.service.http.context,\
-org.argeo.api,\
javax.jcr.nodetype,\
*
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;
/** 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 {
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;
/** 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<>());
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();
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;
/** 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";