From acb6a464eab2729653b3a78f1b5c72f1bc4bc4fb Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 17 Mar 2011 12:34:22 +0000 Subject: [PATCH] Split security UI to security admin ui git-svn-id: https://svn.argeo.org/commons/trunk@4310 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/spring/commands.xml | 12 +- .../META-INF/spring/editors.xml | 2 +- .../META-INF/spring/views.xml | 4 +- .../icons/add.gif | Bin .../icons/password.gif | Bin .../icons/refresh.png | Bin .../icons/remove.gif | Bin .../icons/role.gif | Bin .../icons/save.gif | Bin .../icons/save_security.png | Bin .../icons/save_security_disabled.png | Bin .../icons/security.gif | Bin .../icons/user.gif | Bin .../icons/users.gif | Bin .../org.argeo.security.ui.admin/plugin.xml | 106 +++----------- .../ui/admin/SecurityAdminPerspective.java | 19 +++ .../ui/admin/SecurityAdminPlugin.java | 58 ++++++++ .../security/ui/admin}/commands/AddRole.java | 4 +- .../admin}/commands/OpenArgeoUserEditor.java | 6 +- .../ui/admin}/commands/RefreshUsersList.java | 4 +- .../ui/admin}/commands/SaveArgeoUser.java | 2 +- .../ui/admin}/editors/ArgeoUserEditor.java | 2 +- .../admin}/editors/ArgeoUserEditorInput.java | 2 +- .../admin}/editors/DefaultUserMainPage.java | 6 +- .../security/ui/admin}/views/RolesView.java | 12 +- .../security/ui/admin}/views/UsersView.java | 12 +- .../META-INF/spring/commands.xml | 10 -- .../META-INF/spring/editors.xml | 12 -- .../META-INF/spring/views.xml | 15 -- .../plugins/org.argeo.security.ui/plugin.xml | 119 +--------------- .../security/ui/SecurityPerspective.java | 34 ----- .../security/ui/views/CurrentUserView.java | 129 ------------------ 32 files changed, 129 insertions(+), 441 deletions(-) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/add.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/password.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/refresh.png (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/remove.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/role.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/save.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/save_security.png (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/save_security_disabled.png (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/security.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/user.gif (100%) rename security/plugins/{org.argeo.security.ui => org.argeo.security.ui.admin}/icons/users.gif (100%) create mode 100644 security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java create mode 100644 security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/commands/AddRole.java (92%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/commands/OpenArgeoUserEditor.java (85%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/commands/RefreshUsersList.java (84%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/commands/SaveArgeoUser.java (95%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/editors/ArgeoUserEditor.java (97%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/editors/ArgeoUserEditorInput.java (96%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/editors/DefaultUserMainPage.java (98%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/views/RolesView.java (93%) rename security/plugins/{org.argeo.security.ui/src/main/java/org/argeo/security/ui => org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin}/views/UsersView.java (94%) delete mode 100644 security/plugins/org.argeo.security.ui/META-INF/spring/editors.xml delete mode 100644 security/plugins/org.argeo.security.ui/META-INF/spring/views.xml delete mode 100644 security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java delete mode 100644 security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/CurrentUserView.java diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml index f2009b9cc..cc36ad9fb 100644 --- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml +++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/commands.xml @@ -4,18 +4,14 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - - - diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml index bd0151513..8ff9cec58 100644 --- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml +++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml @@ -5,7 +5,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> - diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml index cdc214f9a..a94e3da30 100644 --- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml +++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - diff --git a/security/plugins/org.argeo.security.ui/icons/add.gif b/security/plugins/org.argeo.security.ui.admin/icons/add.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/add.gif rename to security/plugins/org.argeo.security.ui.admin/icons/add.gif diff --git a/security/plugins/org.argeo.security.ui/icons/password.gif b/security/plugins/org.argeo.security.ui.admin/icons/password.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/password.gif rename to security/plugins/org.argeo.security.ui.admin/icons/password.gif diff --git a/security/plugins/org.argeo.security.ui/icons/refresh.png b/security/plugins/org.argeo.security.ui.admin/icons/refresh.png similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/refresh.png rename to security/plugins/org.argeo.security.ui.admin/icons/refresh.png diff --git a/security/plugins/org.argeo.security.ui/icons/remove.gif b/security/plugins/org.argeo.security.ui.admin/icons/remove.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/remove.gif rename to security/plugins/org.argeo.security.ui.admin/icons/remove.gif diff --git a/security/plugins/org.argeo.security.ui/icons/role.gif b/security/plugins/org.argeo.security.ui.admin/icons/role.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/role.gif rename to security/plugins/org.argeo.security.ui.admin/icons/role.gif diff --git a/security/plugins/org.argeo.security.ui/icons/save.gif b/security/plugins/org.argeo.security.ui.admin/icons/save.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/save.gif rename to security/plugins/org.argeo.security.ui.admin/icons/save.gif diff --git a/security/plugins/org.argeo.security.ui/icons/save_security.png b/security/plugins/org.argeo.security.ui.admin/icons/save_security.png similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/save_security.png rename to security/plugins/org.argeo.security.ui.admin/icons/save_security.png diff --git a/security/plugins/org.argeo.security.ui/icons/save_security_disabled.png b/security/plugins/org.argeo.security.ui.admin/icons/save_security_disabled.png similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/save_security_disabled.png rename to security/plugins/org.argeo.security.ui.admin/icons/save_security_disabled.png diff --git a/security/plugins/org.argeo.security.ui/icons/security.gif b/security/plugins/org.argeo.security.ui.admin/icons/security.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/security.gif rename to security/plugins/org.argeo.security.ui.admin/icons/security.gif diff --git a/security/plugins/org.argeo.security.ui/icons/user.gif b/security/plugins/org.argeo.security.ui.admin/icons/user.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/user.gif rename to security/plugins/org.argeo.security.ui.admin/icons/user.gif diff --git a/security/plugins/org.argeo.security.ui/icons/users.gif b/security/plugins/org.argeo.security.ui.admin/icons/users.gif similarity index 100% rename from security/plugins/org.argeo.security.ui/icons/users.gif rename to security/plugins/org.argeo.security.ui.admin/icons/users.gif diff --git a/security/plugins/org.argeo.security.ui.admin/plugin.xml b/security/plugins/org.argeo.security.ui.admin/plugin.xml index 0a78645af..74fe49297 100644 --- a/security/plugins/org.argeo.security.ui.admin/plugin.xml +++ b/security/plugins/org.argeo.security.ui.admin/plugin.xml @@ -4,9 +4,9 @@ @@ -15,54 +15,23 @@ - - - - - - - - - - - - - - - - - - @@ -72,98 +41,61 @@ point="org.eclipse.ui.commands"> - - + locationURI="toolbar:org.argeo.security.ui.admin.rolesView"> + locationURI="toolbar:org.argeo.security.ui.admin.usersView"> - - - - - - - - - - - - - - - - - @@ -174,9 +106,9 @@ + pattern="org.argeo.security.ui.admin/.*"> diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java new file mode 100644 index 000000000..49f537cd5 --- /dev/null +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPerspective.java @@ -0,0 +1,19 @@ +package org.argeo.security.ui.admin; + +import org.eclipse.ui.IFolderLayout; +import org.eclipse.ui.IPageLayout; +import org.eclipse.ui.IPerspectiveFactory; + +public class SecurityAdminPerspective implements IPerspectiveFactory { + public void createInitialLayout(IPageLayout layout) { + String editorArea = layout.getEditorArea(); + layout.setEditorAreaVisible(true); + layout.setFixed(false); + + IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT, + 0.4f, editorArea); + left.addView("org.argeo.security.ui.admin.adminUsersView"); + left.addView("org.argeo.security.ui.admin.adminRolesView"); + } + +} diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java new file mode 100644 index 000000000..cc5d42919 --- /dev/null +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/SecurityAdminPlugin.java @@ -0,0 +1,58 @@ +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 { + + // The plug-in ID + public static final String PLUGIN_ID = "org.argeo.security.ui.admin"; //$NON-NLS-1$ + + // The shared instance + private static SecurityAdminPlugin plugin; + + /** + * The constructor + */ + public SecurityAdminPlugin() { + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext + * ) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext + * ) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static SecurityAdminPlugin getDefault() { + return plugin; + } + + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } + +} diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/AddRole.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java similarity index 92% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/AddRole.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java index 1873a1391..e8825bce3 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/AddRole.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java @@ -1,8 +1,8 @@ -package org.argeo.security.ui.commands; +package org.argeo.security.ui.admin.commands; import org.argeo.ArgeoException; import org.argeo.security.ArgeoSecurityService; -import org.argeo.security.ui.views.RolesView; +import org.argeo.security.ui.admin.views.RolesView; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java similarity index 85% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenArgeoUserEditor.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java index c9bd25f54..7cac7f4c4 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenArgeoUserEditor.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java @@ -1,7 +1,7 @@ -package org.argeo.security.ui.commands; +package org.argeo.security.ui.admin.commands; -import org.argeo.security.ui.editors.ArgeoUserEditor; -import org.argeo.security.ui.editors.ArgeoUserEditorInput; +import org.argeo.security.ui.admin.editors.ArgeoUserEditor; +import org.argeo.security.ui.admin.editors.ArgeoUserEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/RefreshUsersList.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java similarity index 84% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/RefreshUsersList.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java index a385eb995..10e413a6c 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/RefreshUsersList.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java @@ -1,6 +1,6 @@ -package org.argeo.security.ui.commands; +package org.argeo.security.ui.admin.commands; -import org.argeo.security.ui.views.UsersView; +import org.argeo.security.ui.admin.views.UsersView; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java similarity index 95% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java index 7d817435e..162451413 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.commands; +package org.argeo.security.ui.admin.commands; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java similarity index 97% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java index a896f6170..41e6d4fe7 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.editors; +package org.argeo.security.ui.admin.editors; import org.argeo.ArgeoException; import org.argeo.security.ArgeoSecurityService; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditorInput.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java similarity index 96% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditorInput.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java index 9d61e9fab..8812ee36a 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditorInput.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.editors; +package org.argeo.security.ui.admin.editors; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java similarity index 98% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java index 6180de49a..e4761234a 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/DefaultUserMainPage.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.editors; +package org.argeo.security.ui.admin.editors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -6,7 +6,7 @@ import org.argeo.security.ArgeoSecurityService; import org.argeo.security.ArgeoUser; import org.argeo.security.SimpleArgeoUser; import org.argeo.security.nature.SimpleUserNature; -import org.argeo.security.ui.SecurityUiPlugin; +import org.argeo.security.ui.admin.SecurityAdminPlugin; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CheckboxCellEditor; import org.eclipse.jface.viewers.ColumnLabelProvider; @@ -43,7 +43,7 @@ public class DefaultUserMainPage extends FormPage { final static String ID = "argeoUserEditor.mainPage"; private final static Log log = LogFactory.getLog(DefaultUserMainPage.class); - private final static Image ROLE_CHECKED = SecurityUiPlugin + private final static Image ROLE_CHECKED = SecurityAdminPlugin .getImageDescriptor("icons/security.gif").createImage(); private ArgeoUser user; diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/RolesView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java similarity index 93% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/RolesView.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java index a58675e4b..8a7e5ec82 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/RolesView.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java @@ -1,13 +1,13 @@ -package org.argeo.security.ui.views; +package org.argeo.security.ui.admin.views; import java.util.ArrayList; import org.argeo.ArgeoException; import org.argeo.security.ArgeoSecurityService; import org.argeo.security.ArgeoUser; -import org.argeo.security.ui.SecurityUiPlugin; -import org.argeo.security.ui.commands.AddRole; -import org.argeo.security.ui.commands.OpenArgeoUserEditor; +import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.admin.commands.AddRole; +import org.argeo.security.ui.admin.commands.OpenArgeoUserEditor; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.IParameter; import org.eclipse.core.commands.Parameterization; @@ -57,7 +57,7 @@ public class RolesView extends ViewPart { // default action is add role newRole.addListener(SWT.DefaultSelection, new Listener() { public void handleEvent(Event evt) { - IWorkbench iw = SecurityUiPlugin.getDefault().getWorkbench(); + IWorkbench iw = SecurityAdminPlugin.getDefault().getWorkbench(); IHandlerService handlerService = (IHandlerService) iw .getService(IHandlerService.class); try { @@ -134,7 +134,7 @@ public class RolesView extends ViewPart { if (obj instanceof ArgeoUser) { ArgeoUser argeoUser = (ArgeoUser) obj; - IWorkbench iw = SecurityUiPlugin.getDefault().getWorkbench(); + IWorkbench iw = SecurityAdminPlugin.getDefault().getWorkbench(); IHandlerService handlerService = (IHandlerService) iw .getService(IHandlerService.class); try { diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java similarity index 94% rename from security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java rename to security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java index 08bf7b595..9ef5afe2b 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/UsersView.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java @@ -1,4 +1,4 @@ -package org.argeo.security.ui.views; +package org.argeo.security.ui.admin.views; import java.util.ArrayList; @@ -6,9 +6,8 @@ import org.argeo.ArgeoException; import org.argeo.security.ArgeoSecurityService; import org.argeo.security.ArgeoUser; import org.argeo.security.nature.SimpleUserNature; -import org.argeo.security.ui.SecurityUiPlugin; -import org.argeo.security.ui.commands.OpenArgeoUserEditor; -import org.argeo.security.ui.internal.CurrentUser; +import org.argeo.security.ui.admin.SecurityAdminPlugin; +import org.argeo.security.ui.admin.commands.OpenArgeoUserEditor; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.IParameter; import org.eclipse.core.commands.Parameterization; @@ -103,7 +102,8 @@ public class UsersView extends ViewPart { private class UsersLabelProvider extends LabelProvider implements ITableLabelProvider { public String getColumnText(Object element, int columnIndex) { - String currentUsername = CurrentUser.getUsername(); + //String currentUsername = CurrentUser.getUsername(); + String currentUsername = ""; ArgeoUser user = (ArgeoUser) element; SimpleUserNature simpleNature = SimpleUserNature .findSimpleUserNature(user, simpleNatureType); @@ -139,7 +139,7 @@ public class UsersView extends ViewPart { if (obj instanceof ArgeoUser) { ArgeoUser argeoUser = (ArgeoUser) obj; - IWorkbench iw = SecurityUiPlugin.getDefault().getWorkbench(); + IWorkbench iw = SecurityAdminPlugin.getDefault().getWorkbench(); IHandlerService handlerService = (IHandlerService) iw .getService(IHandlerService.class); try { diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/commands.xml b/security/plugins/org.argeo.security.ui/META-INF/spring/commands.xml index f2009b9cc..5d2523850 100644 --- a/security/plugins/org.argeo.security.ui/META-INF/spring/commands.xml +++ b/security/plugins/org.argeo.security.ui/META-INF/spring/commands.xml @@ -4,18 +4,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - - diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/editors.xml b/security/plugins/org.argeo.security.ui/META-INF/spring/editors.xml deleted file mode 100644 index bd0151513..000000000 --- a/security/plugins/org.argeo.security.ui/META-INF/spring/editors.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/views.xml b/security/plugins/org.argeo.security.ui/META-INF/spring/views.xml deleted file mode 100644 index cdc214f9a..000000000 --- a/security/plugins/org.argeo.security.ui/META-INF/spring/views.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - diff --git a/security/plugins/org.argeo.security.ui/plugin.xml b/security/plugins/org.argeo.security.ui/plugin.xml index 0a78645af..e189e5efe 100644 --- a/security/plugins/org.argeo.security.ui/plugin.xml +++ b/security/plugins/org.argeo.security.ui/plugin.xml @@ -1,33 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -159,24 +62,4 @@ - - - - - - - - - - - - - diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java deleted file mode 100644 index 8183de518..000000000 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.argeo.security.ui; - -import org.eclipse.ui.IFolderLayout; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; - -public class SecurityPerspective implements IPerspectiveFactory { - private String adminRole = "ROLE_ADMIN"; - - public void createInitialLayout(IPageLayout layout) { -// if (!CurrentUser.roles().contains(adminRole)) { -// MessageDialog -// .openError(Display.getCurrent().getActiveShell(), -// "Forbidden", -// "You are not allowed to access this resource."); -// return; -// } - - String editorArea = layout.getEditorArea(); - layout.setEditorAreaVisible(true); - layout.setFixed(false); - - IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT, - 0.4f, editorArea); - - left.addView("org.argeo.security.ui.adminUsersView"); - left.addView("org.argeo.security.ui.adminRolesView"); - } - - public void setAdminRole(String adminRole) { - this.adminRole = adminRole; - } - -} diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/CurrentUserView.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/CurrentUserView.java deleted file mode 100644 index 366ac34fb..000000000 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/CurrentUserView.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.argeo.security.ui.views; - -import org.argeo.security.ui.internal.CurrentUser; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.ui.part.ViewPart; - -public class CurrentUserView extends ViewPart { - private TableViewer viewer; - - @Override - public void createPartControl(Composite parent) { - - // viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL - // | SWT.V_SCROLL); - viewer = new TableViewer(createTable(parent)); - viewer.setContentProvider(new UsersContentProvider()); - viewer.setLabelProvider(new UsersLabelProvider()); - viewer.setInput(getViewSite()); - // viewer.setInput(SecurityContextHolder.getContext()); - } - - protected Table createTable(Composite parent) { - int style = SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL; - - Table table = new Table(parent, style); - - // GridData gridData = new GridData(GridData.FILL_BOTH); - // gridData.grabExcessVerticalSpace = true; - // gridData.grabExcessHorizontalSpace = true; - // gridData.horizontalSpan = 3; - // table.setLayoutData(gridData); - - table.setLinesVisible(true); - table.setHeaderVisible(true); - - TableColumn column = new TableColumn(table, SWT.LEFT, 0); - column.setText("ID"); - column.setWidth(100); - - // column = new TableColumn(table, SWT.LEFT, 1); - // column.setText("Password"); - // column.setWidth(200); - - // column = new TableColumn(table, SWT.LEFT, 2); - // column.setText("Roles"); - // column.setWidth(300); - - return table; - } - - @Override - public void setFocus() { - viewer.getTable().setFocus(); - } - - private class UsersContentProvider implements IStructuredContentProvider { - - public Object[] getElements(Object inputElement) { - return getChildren(inputElement); - } - - public Object[] getChildren(Object parentElement) { - // ILoginContext secureContext = LoginContextFactory - // .createContext("SPRING"); - // try { - // secureContext.login(); - // } catch (LoginException e) { - // // login failed - // } - // - // Subject subject = null; - // // subject = Subject.getSubject(AccessController.getContext()); - // try { - // subject = secureContext.getSubject(); - // } catch (Exception e) { - // e.printStackTrace(); - // throw new ArgeoException("Cannot retrieve subject", e); - // } - // - // if (subject == null) - // throw new ArgeoException("No subject found"); - // return subject.getPrincipals().toArray(); - return CurrentUser.roles().toArray(); - } - - public void dispose() { - // TODO Auto-generated method stub - - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - // TODO Auto-generated method stub - - } - - } - - private class UsersLabelProvider extends LabelProvider implements - ITableLabelProvider { - public String getColumnText(Object element, int columnIndex) { - // Principal argeoUser = (Principal) element; - // switch (columnIndex) { - // case 0: - // return argeoUser.getName(); - // case 1: - // return argeoUser.toString(); - // default: - // throw new ArgeoException("Unmanaged column " + columnIndex); - // } - return element.toString(); - } - - public Image getColumnImage(Object element, int columnIndex) { - // TODO Auto-generated method stub - return null; - } - - } - -} -- 2.30.2