From c873a0359345503b8e3ca07828bd99d525ec7cc0 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Wed, 14 Sep 2016 15:49:52 +0000 Subject: [PATCH] Merge security.ui bundle in the cms.ui.workbench bundle git-svn-id: https://svn.argeo.org/commons/trunk@9140 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/spring/keyring.xml | 0 .../META-INF/spring/osgi.xml | 16 +- .../META-INF/spring/views.xml | 0 org.argeo.cms.ui.workbench/bnd.bnd | 9 +- .../icons/adminLog.gif | Bin .../icons/home.gif | Bin .../icons/log.gif | Bin .../icons/maintenance.gif | Bin .../icons/password.gif | Bin org.argeo.cms.ui.workbench/plugin.xml | 212 +++++++++++++++--- org.argeo.cms.ui.workbench/pom.xml | 11 +- .../securityui.properties | 0 .../security/ui/MaintenancePerspective.java | 0 .../org/argeo/security/ui/PrivilegedJob.java | 0 .../security/ui/RolesSourceProvider.java | 0 .../argeo/security/ui/SecurityUiPlugin.java | 12 +- .../security/ui/UserHomePerspective.java | 0 .../ui/admin/SecurityAdminImages.java | 15 +- .../ui/admin/SecurityAdminPlugin.java | 72 +++--- .../admin/internal/commands/DeleteGroups.java | 4 +- .../admin/internal/commands/DeleteUsers.java | 5 +- .../ui/admin/internal/commands/NewGroup.java | 4 +- .../ui/admin/internal/commands/NewUser.java | 4 +- .../internal/commands/SaveArgeoUser.java | 4 +- .../commands/UserTransactionHandler.java | 4 +- .../ui/admin/internal/parts/GroupsView.java | 5 +- .../ui/admin/internal/parts/UserEditor.java | 6 +- .../ui/admin/internal/parts/UsersView.java | 5 +- .../providers/UserTransactionProvider.java | 8 +- .../ui/commands/OpenChangePasswordDialog.java | 0 .../ui/commands/OpenHomePerspective.java | 0 .../argeo/security/ui/views/AdminLogView.java | 0 .../security/ui/views/LogContentProvider.java | 0 .../org/argeo/security/ui/views/LogView.java | 0 .../argeo/security/ui/views/UserProfile.java | 0 org.argeo.security.ui/.classpath | 9 - org.argeo.security.ui/.project | 28 --- .../.settings/org.eclipse.pde.core.prefs | 3 - .../META-INF/spring/commands.xml | 7 - .../META-INF/spring/osgi.xml | 22 -- org.argeo.security.ui/bnd.bnd | 11 - org.argeo.security.ui/build.properties | 1 - org.argeo.security.ui/icons/user.gif | Bin 310 -> 0 bytes org.argeo.security.ui/plugin.xml | 152 ------------- org.argeo.security.ui/pom.xml | 35 --- 45 files changed, 281 insertions(+), 383 deletions(-) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/META-INF/spring/keyring.xml (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/META-INF/spring/views.xml (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/icons/adminLog.gif (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/icons/home.gif (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/icons/log.gif (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/icons/maintenance.gif (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/icons/password.gif (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/securityui.properties (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/MaintenancePerspective.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/PrivilegedJob.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/RolesSourceProvider.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/SecurityUiPlugin.java (86%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/UserHomePerspective.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/commands/OpenHomePerspective.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/views/AdminLogView.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/views/LogContentProvider.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/views/LogView.java (100%) rename {org.argeo.security.ui => org.argeo.cms.ui.workbench}/src/org/argeo/security/ui/views/UserProfile.java (100%) delete mode 100644 org.argeo.security.ui/.classpath delete mode 100644 org.argeo.security.ui/.project delete mode 100644 org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs delete mode 100644 org.argeo.security.ui/META-INF/spring/commands.xml delete mode 100644 org.argeo.security.ui/META-INF/spring/osgi.xml delete mode 100644 org.argeo.security.ui/bnd.bnd delete mode 100644 org.argeo.security.ui/build.properties delete mode 100644 org.argeo.security.ui/icons/user.gif delete mode 100644 org.argeo.security.ui/plugin.xml delete mode 100644 org.argeo.security.ui/pom.xml diff --git a/org.argeo.security.ui/META-INF/spring/keyring.xml b/org.argeo.cms.ui.workbench/META-INF/spring/keyring.xml similarity index 100% rename from org.argeo.security.ui/META-INF/spring/keyring.xml rename to org.argeo.cms.ui.workbench/META-INF/spring/keyring.xml diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml index 02a63748f..e884f7838 100644 --- a/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml +++ b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml @@ -8,10 +8,24 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" osgi:default-timeout="30000"> + + + + filter="(argeo.jcr.repository.alias=home)" /> + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.security.ui/META-INF/spring/views.xml b/org.argeo.cms.ui.workbench/META-INF/spring/views.xml similarity index 100% rename from org.argeo.security.ui/META-INF/spring/views.xml rename to org.argeo.cms.ui.workbench/META-INF/spring/views.xml diff --git a/org.argeo.cms.ui.workbench/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd index 4ace8db0e..2a5b6bf67 100644 --- a/org.argeo.cms.ui.workbench/bnd.bnd +++ b/org.argeo.cms.ui.workbench/bnd.bnd @@ -1,12 +1,12 @@ Bundle-SymbolicName: org.argeo.cms.ui.workbench;singleton:=true -Bundle-Activator: org.argeo.security.ui.admin.SecurityAdminPlugin +Bundle-Activator: org.argeo.security.ui.SecurityUiPlugin Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.core.runtime -Import-Package: org.eclipse.core.runtime.jobs,\ -org.argeo.cms.auth,\ +Import-Package: org.argeo.cms.auth,\ org.argeo.eclipse.spring,\ +org.eclipse.core.runtime.jobs,\ org.eclipse.jface.window,\ org.eclipse.swt,\ org.eclipse.swt.widgets,\ @@ -14,3 +14,6 @@ org.eclipse.ui.services,\ org.osgi.framework,\ org.springframework.core,\ * + + +# org.argeo.eclipse.ui.workbench;resolution:=optional,\ diff --git a/org.argeo.security.ui/icons/adminLog.gif b/org.argeo.cms.ui.workbench/icons/adminLog.gif similarity index 100% rename from org.argeo.security.ui/icons/adminLog.gif rename to org.argeo.cms.ui.workbench/icons/adminLog.gif diff --git a/org.argeo.security.ui/icons/home.gif b/org.argeo.cms.ui.workbench/icons/home.gif similarity index 100% rename from org.argeo.security.ui/icons/home.gif rename to org.argeo.cms.ui.workbench/icons/home.gif diff --git a/org.argeo.security.ui/icons/log.gif b/org.argeo.cms.ui.workbench/icons/log.gif similarity index 100% rename from org.argeo.security.ui/icons/log.gif rename to org.argeo.cms.ui.workbench/icons/log.gif diff --git a/org.argeo.security.ui/icons/maintenance.gif b/org.argeo.cms.ui.workbench/icons/maintenance.gif similarity index 100% rename from org.argeo.security.ui/icons/maintenance.gif rename to org.argeo.cms.ui.workbench/icons/maintenance.gif diff --git a/org.argeo.security.ui/icons/password.gif b/org.argeo.cms.ui.workbench/icons/password.gif similarity index 100% rename from org.argeo.security.ui/icons/password.gif rename to org.argeo.cms.ui.workbench/icons/password.gif diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml index 2cf0ba210..2636818eb 100644 --- a/org.argeo.cms.ui.workbench/plugin.xml +++ b/org.argeo.cms.ui.workbench/plugin.xml @@ -6,28 +6,65 @@ + + + + + + + + + + + + + + @@ -35,14 +72,14 @@ point="org.eclipse.ui.editors"> @@ -53,34 +90,34 @@ point="org.eclipse.ui.commands"> @@ -101,30 +138,30 @@ + locationURI="toolbar:org.argeo.cms.ui.workbench.rap.userToolbar?after=org.eclipse.ui.file.saveAll"> - + - + @@ -133,27 +170,27 @@ + locationURI="toolbar:org.argeo.cms.ui.workbench.usersView"> @@ -162,21 +199,21 @@ + locationURI="toolbar:org.argeo.cms.ui.workbench.groupsView"> @@ -184,9 +221,9 @@ - + + + + @@ -212,15 +256,113 @@ point="org.eclipse.ui.activities"> + pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.argeo.cms.ui.workbench/pom.xml b/org.argeo.cms.ui.workbench/pom.xml index ead8e2e84..2dccd6a3f 100644 --- a/org.argeo.cms.ui.workbench/pom.xml +++ b/org.argeo.cms.ui.workbench/pom.xml @@ -16,16 +16,21 @@ org.argeo.cms 2.1.46-SNAPSHOT - + org.argeo.commons - org.argeo.util + org.argeo.eclipse.ui.workbench 2.1.46-SNAPSHOT org.argeo.commons - org.argeo.security.ui + org.argeo.util 2.1.46-SNAPSHOT + + + + + org.argeo.commons org.argeo.enterprise diff --git a/org.argeo.security.ui/securityui.properties b/org.argeo.cms.ui.workbench/securityui.properties similarity index 100% rename from org.argeo.security.ui/securityui.properties rename to org.argeo.cms.ui.workbench/securityui.properties diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/MaintenancePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/MaintenancePerspective.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/PrivilegedJob.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/PrivilegedJob.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/PrivilegedJob.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/PrivilegedJob.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/RolesSourceProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/RolesSourceProvider.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/RolesSourceProvider.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/RolesSourceProvider.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/SecurityUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/SecurityUiPlugin.java similarity index 86% rename from org.argeo.security.ui/src/org/argeo/security/ui/SecurityUiPlugin.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/SecurityUiPlugin.java index 935b54386..617fcec63 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/SecurityUiPlugin.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/SecurityUiPlugin.java @@ -23,15 +23,16 @@ import javax.security.auth.callback.UnsupportedCallbackException; import org.argeo.cms.CmsException; import org.argeo.cms.widgets.auth.DefaultLoginDialog; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.widgets.Display; -import org.osgi.framework.BundleActivator; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; /** * The activator class controls the plug-in life cycle */ -public class SecurityUiPlugin implements BundleActivator { +public class SecurityUiPlugin extends AbstractUIPlugin { private static BundleContext bundleContext; public static InheritableThreadLocal display = new InheritableThreadLocal() { @@ -42,7 +43,8 @@ public class SecurityUiPlugin implements BundleActivator { }; // The plug-in ID - public final static String PLUGIN_ID = "org.argeo.security.ui"; //$NON-NLS-1$ + // public final static String PLUGIN_ID = "org.argeo.security.ui"; //$NON-NLS-1$ + public final static String PLUGIN_ID = "org.argeo.cms.ui.workbench"; //$NON-NLS-1$ final static String CONTEXT_KEYRING = "KEYRING"; @@ -92,4 +94,8 @@ public class SecurityUiPlugin implements BundleActivator { } } + + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } } diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/UserHomePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/UserHomePerspective.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java index f15f8ec9a..6cccb08a8 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java @@ -26,6 +26,7 @@ */ package org.argeo.security.ui.admin; +import org.argeo.security.ui.SecurityUiPlugin; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; @@ -33,15 +34,15 @@ import org.eclipse.swt.graphics.Image; public class SecurityAdminImages { private final static String PREFIX = "icons/"; - public final static ImageDescriptor ICON_REMOVE_DESC = SecurityAdminPlugin + public final static ImageDescriptor ICON_REMOVE_DESC = SecurityUiPlugin .getImageDescriptor(PREFIX + "remove.gif"); - public final static ImageDescriptor ICON_USER_DESC = SecurityAdminPlugin + public final static ImageDescriptor ICON_USER_DESC = SecurityUiPlugin .getImageDescriptor(PREFIX + "user.gif"); - + public final static Image ICON_USER = ICON_USER_DESC.createImage(); - public final static Image ICON_GROUP = SecurityAdminPlugin - .getImageDescriptor(PREFIX + "users.gif").createImage(); - public final static Image ICON_ROLE = SecurityAdminPlugin - .getImageDescriptor(PREFIX + "role.gif").createImage(); + public final static Image ICON_GROUP = SecurityUiPlugin.getImageDescriptor( + PREFIX + "users.gif").createImage(); + public final static Image ICON_ROLE = SecurityUiPlugin.getImageDescriptor( + PREFIX + "role.gif").createImage(); } diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java index f9c0ad9af..7222f9234 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java @@ -15,40 +15,38 @@ */ package org.argeo.security.ui.admin; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -public class SecurityAdminPlugin extends AbstractUIPlugin { - public static final String PLUGIN_ID = "org.argeo.security.ui.admin"; //$NON-NLS-1$ - private static SecurityAdminPlugin plugin; - private static BundleContext bundleContext; - - public SecurityAdminPlugin() { - } - - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - bundleContext = context; - } - - public void stop(BundleContext context) throws Exception { - plugin = null; - bundleContext = null; - super.stop(context); - } - - public static SecurityAdminPlugin getDefault() { - return plugin; - } - - public static BundleContext getBundleContext() { - return bundleContext; - } - - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } - -} +public class SecurityAdminPlugin{} + +// public class SecurityAdminPlugin extends AbstractUIPlugin { +// public static final String PLUGIN_ID = "org.argeo.security.ui.admin"; //$NON-NLS-1$ +// private static SecurityAdminPlugin plugin; +// private static BundleContext bundleContext; +// +// public SecurityAdminPlugin() { +// } +// +// public void start(BundleContext context) throws Exception { +// super.start(context); +// plugin = this; +// bundleContext = context; +// } +// +// public void stop(BundleContext context) throws Exception { +// plugin = null; +// bundleContext = null; +// super.stop(context); +// } +// +// public static SecurityAdminPlugin getDefault() { +// return plugin; +// } +// +// public static BundleContext getBundleContext() { +// return bundleContext; +// } +// +// public static ImageDescriptor getImageDescriptor(String path) { +// return imageDescriptorFromPlugin(PLUGIN_ID, path); +// } +// +// } diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java index df5d430ab..5a9b033bb 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.List; import org.argeo.cms.util.useradmin.UserAdminUtils; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.argeo.security.ui.admin.internal.parts.UserEditorInput; import org.eclipse.core.commands.AbstractHandler; @@ -38,7 +38,7 @@ import org.osgi.service.useradmin.UserAdminEvent; /** Delete the selected groups */ public class DeleteGroups extends AbstractHandler { - public final static String ID = SecurityAdminPlugin.PLUGIN_ID + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".deleteGroups"; /* DEPENDENCY INJECTION */ diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java index e583bef53..3618be187 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.List; import org.argeo.cms.util.useradmin.UserAdminUtils; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.argeo.security.ui.admin.internal.parts.UserEditorInput; import org.eclipse.core.commands.AbstractHandler; @@ -38,8 +38,7 @@ import org.osgi.service.useradmin.UserAdminEvent; /** Delete the selected users */ public class DeleteUsers extends AbstractHandler { - public final static String ID = SecurityAdminPlugin.PLUGIN_ID - + ".deleteUsers"; + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".deleteUsers"; /* DEPENDENCY INJECTION */ private UserAdminWrapper userAdminWrapper; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java index 75b9b0b33..755f05bf3 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java @@ -24,7 +24,7 @@ import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.ArgeoNames; import org.argeo.osgi.useradmin.LdifName; import org.argeo.osgi.useradmin.UserAdminConf; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -48,7 +48,7 @@ import org.osgi.service.useradmin.UserAdminEvent; /** Create a new group */ public class NewGroup extends AbstractHandler { - public final static String ID = SecurityAdminPlugin.PLUGIN_ID + ".newGroup"; + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".newGroup"; /* DEPENDENCY INJECTION */ private UserAdminWrapper userAdminWrapper; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java index c04c83562..8289d59bf 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java @@ -30,7 +30,7 @@ import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.ArgeoNames; import org.argeo.osgi.useradmin.LdifName; import org.argeo.osgi.useradmin.UserAdminConf; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -62,7 +62,7 @@ public class NewUser extends AbstractHandler { */ public final static String EMAIL_PATTERN = "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$"; // private final static Log log = LogFactory.getLog(NewUser.class); - public final static String ID = SecurityAdminPlugin.PLUGIN_ID + ".newUser"; + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".newUser"; /* DEPENDENCY INJECTION */ private UserAdminWrapper userAdminWrapper; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java index 61d8a7daf..c2c78f90c 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java @@ -15,7 +15,7 @@ */ package org.argeo.security.ui.admin.internal.commands; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -27,7 +27,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Save the currently edited Argeo user. */ public class SaveArgeoUser extends AbstractHandler { - public final static String ID = SecurityAdminPlugin.PLUGIN_ID + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".saveArgeoUser"; public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java index 236584ca3..6f04635af 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java @@ -19,7 +19,7 @@ import javax.transaction.Status; import javax.transaction.UserTransaction; import org.argeo.cms.CmsException; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UiAdminUtils; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.eclipse.core.commands.AbstractHandler; @@ -29,7 +29,7 @@ import org.osgi.service.useradmin.UserAdminEvent; /** Manage the transaction that is bound to the current perspective */ public class UserTransactionHandler extends AbstractHandler { - public final static String ID = SecurityAdminPlugin.PLUGIN_ID + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".userTransactionHandler"; public final static String PARAM_COMMAND_ID = "param.commandId"; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java index 82f4e1bdd..7225ef865 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java @@ -28,7 +28,7 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.ArgeoNames; import org.argeo.osgi.useradmin.LdifName; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UiUserAdminListener; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.argeo.security.ui.admin.internal.providers.CommonNameLP; @@ -58,8 +58,7 @@ import org.osgi.service.useradmin.UserAdminListener; /** List all groups with filter */ public class GroupsView extends ViewPart implements ArgeoNames { private final static Log log = LogFactory.getLog(GroupsView.class); - public final static String ID = SecurityAdminPlugin.PLUGIN_ID - + ".groupsView"; + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".groupsView"; /* DEPENDENCY INJECTION */ private UserAdminWrapper userAdminWrapper; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java index 6c0731d01..d6cae1a1a 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java @@ -21,7 +21,7 @@ import java.util.List; import org.argeo.cms.CmsException; import org.argeo.cms.util.useradmin.UserAdminUtils; import org.argeo.osgi.useradmin.LdifName; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UiUserAdminListener; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.eclipse.core.runtime.IProgressMonitor; @@ -44,9 +44,9 @@ import org.osgi.service.useradmin.UserAdminEvent; public class UserEditor extends FormEditor { private static final long serialVersionUID = 8357851520380820241L; - public final static String USER_EDITOR_ID = SecurityAdminPlugin.PLUGIN_ID + public final static String USER_EDITOR_ID = SecurityUiPlugin.PLUGIN_ID + ".userEditor"; - public final static String GROUP_EDITOR_ID = SecurityAdminPlugin.PLUGIN_ID + public final static String GROUP_EDITOR_ID = SecurityUiPlugin.PLUGIN_ID + ".groupEditor"; /* DEPENDENCY INJECTION */ diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java index a397432a8..86fb439ff 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java @@ -26,7 +26,7 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.ArgeoNames; import org.argeo.osgi.useradmin.LdifName; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.argeo.security.ui.admin.internal.UiUserAdminListener; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.argeo.security.ui.admin.internal.providers.CommonNameLP; @@ -53,8 +53,7 @@ import org.osgi.service.useradmin.UserAdminListener; public class UsersView extends ViewPart implements ArgeoNames { // private final static Log log = LogFactory.getLog(UsersView.class); - public final static String ID = SecurityAdminPlugin.PLUGIN_ID - + ".usersView"; + public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".usersView"; /* DEPENDENCY INJECTION */ private UserAdminWrapper userAdminWrapper; diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java index 4ba304bb5..d4a53fcff 100644 --- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java +++ b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java @@ -9,7 +9,7 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.SecurityUiPlugin; import org.eclipse.ui.AbstractSourceProvider; import org.eclipse.ui.ISources; @@ -18,7 +18,7 @@ public class UserTransactionProvider extends AbstractSourceProvider { private final static Log log = LogFactory .getLog(UserTransactionProvider.class); - public final static String TRANSACTION_STATE = SecurityAdminPlugin.PLUGIN_ID + public final static String TRANSACTION_STATE = SecurityUiPlugin.PLUGIN_ID + ".userTransactionState"; public final static String STATUS_ACTIVE = "status.active"; public final static String STATUS_NO_TRANSACTION = "status.noTransaction"; @@ -28,13 +28,13 @@ public class UserTransactionProvider extends AbstractSourceProvider { @Override public String[] getProvidedSourceNames() { - return new String[] { TRANSACTION_STATE}; + return new String[] { TRANSACTION_STATE }; } @Override public Map getCurrentState() { Map currentState = new HashMap(1); - currentState.put(TRANSACTION_STATE, getInternalCurrentState()); + currentState.put(TRANSACTION_STATE, getInternalCurrentState()); return currentState; } diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenHomePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenHomePerspective.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenHomePerspective.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenHomePerspective.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/views/AdminLogView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/views/AdminLogView.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/views/LogContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogContentProvider.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/views/LogContentProvider.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogContentProvider.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/views/LogView.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/views/LogView.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/views/UserProfile.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java similarity index 100% rename from org.argeo.security.ui/src/org/argeo/security/ui/views/UserProfile.java rename to org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java diff --git a/org.argeo.security.ui/.classpath b/org.argeo.security.ui/.classpath deleted file mode 100644 index 457b11571..000000000 --- a/org.argeo.security.ui/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/org.argeo.security.ui/.project b/org.argeo.security.ui/.project deleted file mode 100644 index a052e9a57..000000000 --- a/org.argeo.security.ui/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.security.ui - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs b/org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index dfa507d81..000000000 --- a/org.argeo.security.ui/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sat Jan 15 18:15:48 CET 2011 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/org.argeo.security.ui/META-INF/spring/commands.xml b/org.argeo.security.ui/META-INF/spring/commands.xml deleted file mode 100644 index 3b2e6ccb0..000000000 --- a/org.argeo.security.ui/META-INF/spring/commands.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/org.argeo.security.ui/META-INF/spring/osgi.xml b/org.argeo.security.ui/META-INF/spring/osgi.xml deleted file mode 100644 index 500efd1df..000000000 --- a/org.argeo.security.ui/META-INF/spring/osgi.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.security.ui/bnd.bnd b/org.argeo.security.ui/bnd.bnd deleted file mode 100644 index 66284b153..000000000 --- a/org.argeo.security.ui/bnd.bnd +++ /dev/null @@ -1,11 +0,0 @@ -Bundle-SymbolicName: org.argeo.security.ui;singleton:=true -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.argeo.security.ui.SecurityUiPlugin - -Import-Package: org.argeo.eclipse.spring,\ -org.osgi.framework,\ -org.eclipse.swt,\ -org.eclipse.jface.window,\ -org.apache.log4j;resolution:=optional,\ -org.eclipse.ui;resolution:=optional,\ -* diff --git a/org.argeo.security.ui/build.properties b/org.argeo.security.ui/build.properties deleted file mode 100644 index 30f715358..000000000 --- a/org.argeo.security.ui/build.properties +++ /dev/null @@ -1 +0,0 @@ -source.. = src/ diff --git a/org.argeo.security.ui/icons/user.gif b/org.argeo.security.ui/icons/user.gif deleted file mode 100644 index 90a00147bcb02b6855aa21c532a1ccfa992db5c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmZ?wbhEHb6krfwxXQqw=RZ|1V5&*zbjzr@wlTAuk{7w9FY(G+?v^sgH*b|s=DdWu zZD~#0yBD7gDBG0Nv%jGKK*^*-71NG3%{kFF|CE3E#-Pg0p;ep1Yqmz#ZHsN(kz1OCBW9Gn(60SWa+}gzo||X6OdpAC pniZ}UB2{8+qLvgXp{K+VYbvgzz|tvZD96;vC(6Ls8R^Ji4FH!Gg(Uz0 diff --git a/org.argeo.security.ui/plugin.xml b/org.argeo.security.ui/plugin.xml deleted file mode 100644 index b843d9c91..000000000 --- a/org.argeo.security.ui/plugin.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml deleted file mode 100644 index beb37408e..000000000 --- a/org.argeo.security.ui/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - org.argeo.commons - 2.1.46-SNAPSHOT - argeo-commons - .. - - org.argeo.security.ui - CMS Workbench - jar - - - org.argeo.commons - org.argeo.cms - 2.1.46-SNAPSHOT - - - - - - - - org.argeo.commons - org.argeo.eclipse.ui.workbench - 2.1.46-SNAPSHOT - - - org.argeo.commons - org.argeo.util - 2.1.46-SNAPSHOT - - - \ No newline at end of file -- 2.30.2