From 35dded721530f8bbc368380a7bcce9dec37f56bb Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 7 Jan 2022 10:57:17 +0100 Subject: [PATCH] Rename into CMS Context --- .../api/cms/{CmsData.java => CmsContext.java} | 11 +++--- .../org/argeo/cms/e4/users/GroupEditor.java | 38 ++++++++----------- .../cms/e4/users/providers/RoleIconLP.java | 4 +- .../argeo/cms/internal/kernel/Activator.java | 8 ++-- .../{CmsDataImpl.java => CmsContextImpl.java} | 10 ++--- 5 files changed, 32 insertions(+), 39 deletions(-) rename org.argeo.api/src/org/argeo/api/cms/{CmsData.java => CmsContext.java} (59%) rename org.argeo.cms/src/org/argeo/cms/internal/kernel/{CmsDataImpl.java => CmsContextImpl.java} (88%) diff --git a/org.argeo.api/src/org/argeo/api/cms/CmsData.java b/org.argeo.api/src/org/argeo/api/cms/CmsContext.java similarity index 59% rename from org.argeo.api/src/org/argeo/api/cms/CmsData.java rename to org.argeo.api/src/org/argeo/api/cms/CmsContext.java index a12a3ce7f..a9616c8ae 100644 --- a/org.argeo.api/src/org/argeo/api/cms/CmsData.java +++ b/org.argeo.api/src/org/argeo/api/cms/CmsContext.java @@ -1,9 +1,10 @@ package org.argeo.api.cms; -import javax.naming.ldap.LdapName; - -/** The structured data */ -public interface CmsData { +/** + * A logical view on this CMS instance, independently of a particular launch or + * deployment. + */ +public interface CmsContext { /** * To be used as an identifier of a workgroup, typically as a value for the * 'businessCategory' attribute in LDAP. @@ -11,5 +12,5 @@ public interface CmsData { public final static String WORKGROUP = "workgroup"; /** Mark this group as a workgroup */ - void createWorkgroup(LdapName groupDn); + void createWorkgroup(String groupDn); } diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java index 239bb3156..a011c5f62 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.users; -import static org.argeo.api.cms.CmsData.WORKGROUP; +import static org.argeo.api.cms.CmsContext.WORKGROUP; import static org.argeo.cms.auth.UserAdminUtils.setProperty; import static org.argeo.util.naming.LdapAttrs.businessCategory; import static org.argeo.util.naming.LdapAttrs.description; @@ -15,12 +15,9 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.naming.InvalidNameException; -import javax.naming.ldap.LdapName; -import org.argeo.api.cms.CmsData; import org.argeo.api.cms.CmsConstants; -import org.argeo.cms.CmsException; +import org.argeo.api.cms.CmsContext; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.providers.CommonNameLP; import org.argeo.cms.e4.users.providers.MailLP; @@ -33,6 +30,7 @@ import org.argeo.cms.ui.eclipse.forms.IManagedForm; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; +import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.util.naming.LdapAttrs; @@ -87,7 +85,7 @@ public class GroupEditor extends AbstractRoleEditor { @Inject private Repository repository; @Inject - private CmsData nodeInstance; + private CmsContext nodeInstance; // private final UserAdminWrapper userAdminWrapper; private Session groupsSession; @@ -121,7 +119,7 @@ public class GroupEditor extends AbstractRoleEditor { try { groupsSession = repository.login(CmsConstants.SRV_WORKSPACE); } catch (RepositoryException e) { - throw new CmsException("Cannot retrieve session", e); + throw new JcrException("Cannot retrieve session", e); } // ScrolledForm form = mf.getForm(); // Composite body = form.getBody(); @@ -219,20 +217,15 @@ public class GroupEditor extends AbstractRoleEditor { Node workgroupHome = CmsJcrUtils.getGroupHome(groupsSession, cn); if (workgroupHome != null) return; // already marked as workgroup, do nothing - else - try { - // improve transaction management - userAdminWrapper.beginTransactionIfNeeded(); - nodeInstance.createWorkgroup(new LdapName(group.getName())); - setProperty(group, businessCategory, WORKGROUP); - userAdminWrapper.commitOrNotifyTransactionStateChange(); - userAdminWrapper - .notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, group)); - part.refresh(); - } catch (InvalidNameException e1) { - throw new CmsException("Cannot create Workgroup for " + group.toString(), e1); - } - + else { + // improve transaction management + userAdminWrapper.beginTransactionIfNeeded(); + nodeInstance.createWorkgroup(group.getName()); + setProperty(group, businessCategory, WORKGROUP); + userAdminWrapper.commitOrNotifyTransactionStateChange(); + userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, group)); + part.refresh(); + } } } }); @@ -521,7 +514,8 @@ public class GroupEditor extends AbstractRoleEditor { try { transaction.commit(); } catch (Exception e) { - throw new CmsException("Cannot commit transaction " + "after user group membership update", e); + throw new IllegalStateException( + "Cannot commit transaction " + "after user group membership update", e); } userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, myGroup)); } diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java index 49a2026c9..8c94093e4 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.users.providers; -import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.SecurityAdminImages; @@ -26,7 +26,7 @@ public class RoleIconLP extends UserAdminAbstractLP { return SecurityAdminImages.ICON_ROLE; else if (user.getType() == Role.GROUP) { String businessCategory = UserAdminUtils.getProperty(user, LdapAttrs.businessCategory); - if (businessCategory != null && businessCategory.equals(CmsData.WORKGROUP)) + if (businessCategory != null && businessCategory.equals(CmsContext.WORKGROUP)) return SecurityAdminImages.ICON_WORKGROUP; return SecurityAdminImages.ICON_GROUP; } else diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java index 535c32853..f50594210 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java @@ -14,7 +14,7 @@ import javax.security.auth.login.Configuration; import org.argeo.api.cms.CmsState; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsConstants; -import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsDeployment; import org.argeo.cms.ArgeoLogger; import org.argeo.cms.auth.ident.IdentClient; @@ -53,7 +53,7 @@ public class Activator implements BundleActivator { private NodeLogger logger; private CmsStateImpl nodeState; private CmsDeploymentImpl nodeDeployment; - private CmsDataImpl nodeInstance; + private CmsContextImpl nodeInstance; private ServiceTracker userAdminSt; private ExecutorService internalExecutorService; @@ -169,8 +169,8 @@ public class Activator implements BundleActivator { // registerService(NodeDeployment.class, nodeDeployment, null); // Node instance - nodeInstance = new CmsDataImpl(); - registerService(CmsData.class, nodeInstance, null); + nodeInstance = new CmsContextImpl(); + registerService(CmsContext.class, nodeInstance, null); } public static void registerService(Class clss, T service, Dictionary properties) { diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDataImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsContextImpl.java similarity index 88% rename from org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDataImpl.java rename to org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsContextImpl.java index 3b197e24c..822959b63 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDataImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsContextImpl.java @@ -1,19 +1,17 @@ package org.argeo.cms.internal.kernel; -import javax.naming.ldap.LdapName; - -import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsLog; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; -public class CmsDataImpl implements CmsData { +public class CmsContextImpl implements CmsContext { private final CmsLog log = CmsLog.getLog(getClass()); private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); // private EgoRepository egoRepository; - public CmsDataImpl() { + public CmsContextImpl() { initTrackers(); } @@ -45,7 +43,7 @@ public class CmsDataImpl implements CmsData { } @Override - public void createWorkgroup(LdapName dn) { + public void createWorkgroup(String dn) { // if (egoRepository == null) // throw new CmsException("Ego repository is not available"); // // TODO add check that the group exists -- 2.30.2