From: Mathieu Baudier Date: Thu, 17 Mar 2011 13:27:49 +0000 (+0000) Subject: Split security UI to security admin ui X-Git-Tag: argeo-commons-2.1.30~1352 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=183b34a3f8c0bce78bed916d413934f20522818c;p=lgpl%2Fargeo-commons.git Split security UI to security admin ui git-svn-id: https://svn.argeo.org/commons/trunk@4312 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/demo/argeo-node-ui.product b/demo/argeo-node-ui.product index 9dba05536..820f999c7 100644 --- a/demo/argeo-node-ui.product +++ b/demo/argeo-node-ui.product @@ -8,7 +8,7 @@ -console -clean - -Dlog4j.configuration="file:${system_property:user.home}/dev/src/commons/security/demo/log4j.properties" + -Dlog4j.configuration="file:${system_property:user.home}/dev/src/commons/demo/log4j.properties" -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -92,7 +92,7 @@ - + @@ -156,7 +156,7 @@ - + diff --git a/demo/argeo-node-web.properties b/demo/argeo-node-web.properties index 5009da72a..50e012054 100644 --- a/demo/argeo-node-web.properties +++ b/demo/argeo-node-web.properties @@ -18,4 +18,7 @@ org.argeo.jcr.ui.explorer,\ org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective +argeo.node.repo.home=~/.argeo/server_noderepo +argeo.node.repo.dburl=jdbc:h2:file:~/.argeo/h2/server_noderepo_db + log4j.configuration=file:../../log4j.properties diff --git a/security/modules/org.argeo.security.manager.ldap/build.properties b/security/modules/org.argeo.security.manager.ldap/build.properties new file mode 100644 index 000000000..5f22cdd44 --- /dev/null +++ b/security/modules/org.argeo.security.manager.ldap/build.properties @@ -0,0 +1 @@ +bin.includes = META-INF/ diff --git a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml index 92b4129fd..6822ed70a 100644 --- a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml +++ b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml @@ -12,9 +12,6 @@ - - @@ -23,7 +20,7 @@ - + diff --git a/security/modules/org.argeo.security.services/build.properties b/security/modules/org.argeo.security.services/build.properties new file mode 100644 index 000000000..5f22cdd44 --- /dev/null +++ b/security/modules/org.argeo.security.services/build.properties @@ -0,0 +1 @@ +bin.includes = META-INF/ 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 cc36ad9fb..044fabf58 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 @@ -10,7 +10,7 @@ scope="prototype" /> - + 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 8ff9cec58..84399c26e 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 @@ -7,6 +7,6 @@ - + diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/osgi.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/osgi.xml index 6574cf125..f77b5a029 100644 --- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/osgi.xml +++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/osgi.xml @@ -8,5 +8,5 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" osgi:default-timeout="30000"> - + \ No newline at end of file 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 a94e3da30..8cf9fd68c 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 @@ -6,10 +6,10 @@ - + - + diff --git a/security/plugins/org.argeo.security.ui.admin/build.properties b/security/plugins/org.argeo.security.ui.admin/build.properties new file mode 100644 index 000000000..b840a9456 --- /dev/null +++ b/security/plugins/org.argeo.security.ui.admin/build.properties @@ -0,0 +1,4 @@ +bin.includes = plugin.xml,\ + META-INF/ +source.. = src/main/java/ +output.. = target/classes/ diff --git a/security/plugins/org.argeo.security.ui.admin/plugin.xml b/security/plugins/org.argeo.security.ui.admin/plugin.xml index 74fe49297..d5bc7d18d 100644 --- a/security/plugins/org.argeo.security.ui.admin/plugin.xml +++ b/security/plugins/org.argeo.security.ui.admin/plugin.xml @@ -4,7 +4,7 @@ diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml index 83b0192c3..807258b82 100644 --- a/security/plugins/org.argeo.security.ui.admin/pom.xml +++ b/security/plugins/org.argeo.security.ui.admin/pom.xml @@ -29,37 +29,17 @@ maven-bundle-plugin ${version.maven-bundle-plugin} - - - - - - - - - - - - - - - - - - - lazy - org.argeo.security.ui.SecurityUiPlugin - org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime + org.argeo.security.ui.admin.SecurityAdminPlugin + + org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime + org.argeo.eclipse.spring, * - - !org.argeo.security.ui.internal.*, - org.argeo.security.ui.* - + org.argeo.security.ui.admin.* @@ -80,13 +60,6 @@ 0.2.3-SNAPSHOT - - - org.argeo.commons.eclipse - org.argeo.eclipse.dep.common - 0.2.3-SNAPSHOT - - org.argeo.commons.eclipse @@ -111,7 +84,8 @@ org.slf4j - com.springsource.slf4j.org.apache.commons.logging + com.springsource.slf4j.org.apache.commons.logging + 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 index 49f537cd5..4c17bbca6 100644 --- 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 @@ -1,5 +1,7 @@ package org.argeo.security.ui.admin; +import org.argeo.security.ui.admin.views.RolesView; +import org.argeo.security.ui.admin.views.UsersView; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; @@ -12,8 +14,8 @@ public class SecurityAdminPerspective implements IPerspectiveFactory { 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"); + left.addView(UsersView.ID); + left.addView(RolesView.ID); } } 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 index cc5d42919..dfe767bf1 100644 --- 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 @@ -5,48 +5,22 @@ 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; } diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java index e8825bce3..047c167e0 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/AddRole.java @@ -1,7 +1,7 @@ package org.argeo.security.ui.admin.commands; import org.argeo.ArgeoException; -import org.argeo.security.ArgeoSecurityService; +import org.argeo.security.UserAdminService; import org.argeo.security.ui.admin.views.RolesView; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -10,8 +10,8 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Add a new role. */ public class AddRole extends AbstractHandler { - public final static String COMMAND_ID = "org.argeo.security.ui.addRole"; - private ArgeoSecurityService securityService; + public final static String COMMAND_ID = "org.argeo.security.ui.admin.addRole"; + private UserAdminService userAdminService; private String rolePrefix = "ROLE_"; public Object execute(ExecutionEvent event) throws ExecutionException { @@ -26,15 +26,15 @@ public class AddRole extends AbstractHandler { role = role.trim().toUpperCase(); if (!role.startsWith(rolePrefix)) role = rolePrefix + role; - if (securityService.listEditableRoles().contains(role)) + if (userAdminService.listEditableRoles().contains(role)) throw new ArgeoException("Role " + role + " already exists"); - securityService.newRole(role); + userAdminService.newRole(role); rolesView.refresh(); return null; } - public void setSecurityService(ArgeoSecurityService securityService) { - this.securityService = securityService; + public void setUserAdminService(UserAdminService userAdminService) { + this.userAdminService = userAdminService; } } diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java index 7cac7f4c4..155e15560 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/OpenArgeoUserEditor.java @@ -10,8 +10,8 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Command handler to set visible or open a Argeo user. */ public class OpenArgeoUserEditor extends AbstractHandler { - public final static String COMMAND_ID = "org.argeo.security.ui.openArgeoUserEditor"; - public final static String PARAM_USERNAME = "org.argeo.security.ui.username"; + public final static String COMMAND_ID = "org.argeo.security.ui.admin.openArgeoUserEditor"; + public final static String PARAM_USERNAME = "org.argeo.security.ui.admin.username"; public Object execute(ExecutionEvent event) throws ExecutionException { try { diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java index 162451413..aed347472 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/SaveArgeoUser.java @@ -11,7 +11,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Save the currently edited Argeo user. */ public class SaveArgeoUser extends AbstractHandler { - public final static String COMMAND_ID = "org.argeo.security.ui.saveArgeoUser"; + public final static String COMMAND_ID = "org.argeo.security.ui.admin.saveArgeoUser"; public Object execute(ExecutionEvent event) throws ExecutionException { try { diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java index 41e6d4fe7..9b82e8783 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java @@ -1,9 +1,9 @@ package org.argeo.security.ui.admin.editors; import org.argeo.ArgeoException; -import org.argeo.security.ArgeoSecurityService; import org.argeo.security.ArgeoUser; import org.argeo.security.SimpleArgeoUser; +import org.argeo.security.UserAdminService; import org.argeo.security.nature.SimpleUserNature; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.ui.IEditorInput; @@ -13,10 +13,10 @@ import org.eclipse.ui.forms.editor.FormEditor; /** Editor for an Argeo user. */ public class ArgeoUserEditor extends FormEditor { - public final static String ID = "org.argeo.security.ui.adminArgeoUserEditor"; + public final static String ID = "org.argeo.security.ui.admin.adminArgeoUserEditor"; private ArgeoUser user; - private ArgeoSecurityService securityService; + private UserAdminService userAdminService; public void init(IEditorSite site, IEditorInput input) throws PartInitException { @@ -28,14 +28,14 @@ public class ArgeoUserEditor extends FormEditor { user.getUserNatures().put(SimpleUserNature.TYPE, new SimpleUserNature()); } else - user = securityService.getUser(username); + user = userAdminService.getUser(username); this.setPartProperty("name", username != null ? username : ""); setPartName(username != null ? username : ""); } protected void addPages() { try { - addPage(new DefaultUserMainPage(this, securityService, user)); + addPage(new DefaultUserMainPage(this, userAdminService, user)); } catch (PartInitException e) { throw new ArgeoException("Not able to add page ", e); @@ -48,10 +48,10 @@ public class ArgeoUserEditor extends FormEditor { // TODO: make it more generic findPage(DefaultUserMainPage.ID).doSave(monitor); - if (securityService.userExists(user.getUsername())) - securityService.updateUser(user); + if (userAdminService.userExists(user.getUsername())) + userAdminService.updateUser(user); else { - securityService.newUser(user); + userAdminService.newUser(user); setPartName(user.getUsername()); } firePropertyChange(PROP_DIRTY); @@ -66,7 +66,7 @@ public class ArgeoUserEditor extends FormEditor { return false; } - public void setSecurityService(ArgeoSecurityService securityService) { - this.securityService = securityService; + public void setUserAdminService(UserAdminService userAdminService) { + this.userAdminService = userAdminService; } } diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java index e4761234a..ee36b5731 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java @@ -2,9 +2,9 @@ package org.argeo.security.ui.admin.editors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.security.ArgeoSecurityService; import org.argeo.security.ArgeoUser; import org.argeo.security.SimpleArgeoUser; +import org.argeo.security.UserAdminService; import org.argeo.security.nature.SimpleUserNature; import org.argeo.security.ui.admin.SecurityAdminPlugin; import org.eclipse.jface.viewers.CellEditor; @@ -49,10 +49,10 @@ public class DefaultUserMainPage extends FormPage { private ArgeoUser user; private SimpleUserNature simpleNature; private String simpleNatureType; - private ArgeoSecurityService securityService; + private UserAdminService securityService; public DefaultUserMainPage(FormEditor editor, - ArgeoSecurityService securityService, ArgeoUser user) { + UserAdminService securityService, ArgeoUser user) { super(editor, ID, "Main"); this.securityService = securityService; this.user = user; diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java index 8a7e5ec82..e2779590a 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java @@ -3,8 +3,8 @@ 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.UserAdminService; import org.argeo.security.ui.admin.SecurityAdminPlugin; import org.argeo.security.ui.admin.commands.AddRole; import org.argeo.security.ui.admin.commands.OpenArgeoUserEditor; @@ -37,12 +37,12 @@ import org.eclipse.ui.part.ViewPart; /** List all roles. */ public class RolesView extends ViewPart { - public final static String ID = "org.argeo.security.ui.rolesView"; + public final static String ID = "org.argeo.security.ui.admin.adminRolesView"; private Text newRole; private TableViewer viewer; - private ArgeoSecurityService securityService; + private UserAdminService userAdminService; private String addNewRoleText = ""; @@ -92,8 +92,8 @@ public class RolesView extends ViewPart { viewer.getTable().setFocus(); } - public void setSecurityService(ArgeoSecurityService securityService) { - this.securityService = securityService; + public void setUserAdminService(UserAdminService userAdminService) { + this.userAdminService = userAdminService; } public String getAddNewRoleText() { @@ -103,7 +103,7 @@ public class RolesView extends ViewPart { private class RolesContentProvider implements IStructuredContentProvider { public Object[] getElements(Object inputElement) { - return securityService.listEditableRoles().toArray(); + return userAdminService.listEditableRoles().toArray(); } public void dispose() { diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java index 9ef5afe2b..df909b6c7 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java @@ -3,8 +3,8 @@ 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.UserAdminService; import org.argeo.security.nature.SimpleUserNature; import org.argeo.security.ui.admin.SecurityAdminPlugin; import org.argeo.security.ui.admin.commands.OpenArgeoUserEditor; @@ -33,10 +33,10 @@ import org.eclipse.ui.part.ViewPart; /** List all users. */ public class UsersView extends ViewPart { - public final static String ID = "org.argeo.security.ui.usersView"; + public final static String ID = "org.argeo.security.ui.admin.adminUsersView"; private TableViewer viewer; - private ArgeoSecurityService securityService; + private UserAdminService userAdminService; private String simpleNatureType = null; @@ -73,8 +73,8 @@ public class UsersView extends ViewPart { viewer.getTable().setFocus(); } - public void setSecurityService(ArgeoSecurityService securityService) { - this.securityService = securityService; + public void setUserAdminService(UserAdminService userAdminService) { + this.userAdminService = userAdminService; } public void setSimpleNatureType(String simpleNatureType) { @@ -88,7 +88,7 @@ public class UsersView extends ViewPart { private class UsersContentProvider implements IStructuredContentProvider { public Object[] getElements(Object inputElement) { - return securityService.listUsers().toArray(); + return userAdminService.listUsers().toArray(); } public void dispose() { @@ -102,7 +102,7 @@ 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 diff --git a/security/plugins/org.argeo.security.ui.rap/build.properties b/security/plugins/org.argeo.security.ui.rap/build.properties new file mode 100644 index 000000000..b840a9456 --- /dev/null +++ b/security/plugins/org.argeo.security.ui.rap/build.properties @@ -0,0 +1,4 @@ +bin.includes = plugin.xml,\ + META-INF/ +source.. = src/main/java/ +output.. = target/classes/ 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 5d2523850..c5fe0e337 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 @@ -6,6 +6,6 @@ - + diff --git a/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml b/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml index 6574cf125..2477c93a8 100644 --- a/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml +++ b/security/plugins/org.argeo.security.ui/META-INF/spring/osgi.xml @@ -8,5 +8,5 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" osgi:default-timeout="30000"> - + \ No newline at end of file diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml index ab1ec19c1..48427089c 100644 --- a/security/plugins/org.argeo.security.ui/pom.xml +++ b/security/plugins/org.argeo.security.ui/pom.xml @@ -29,25 +29,6 @@ maven-bundle-plugin ${version.maven-bundle-plugin} - - - - - - - - - - - - - - - - - - - lazy org.argeo.security.ui.SecurityUiPlugin @@ -80,13 +61,6 @@ 0.2.3-SNAPSHOT - - - org.argeo.commons.eclipse - org.argeo.eclipse.dep.common - 0.2.3-SNAPSHOT - - org.argeo.commons.eclipse diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java index 70471159d..bd6da3657 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java +++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/OpenChangePasswordDialog.java @@ -1,6 +1,6 @@ package org.argeo.security.ui.commands; -import org.argeo.security.ArgeoSecurityService; +import org.argeo.security.CurrentUserService; import org.argeo.security.ui.dialogs.ChangePasswordDialog; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -9,17 +9,17 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Opens the change password dialog. */ public class OpenChangePasswordDialog extends AbstractHandler { - private ArgeoSecurityService securityService; + private CurrentUserService currentUserService; public Object execute(ExecutionEvent event) throws ExecutionException { ChangePasswordDialog dialog = new ChangePasswordDialog( - HandlerUtil.getActiveShell(event), securityService); + HandlerUtil.getActiveShell(event), currentUserService); dialog.open(); return null; } - public void setSecurityService(ArgeoSecurityService securityService) { - this.securityService = securityService; + public void setCurrentUserService(CurrentUserService currentUserService) { + this.currentUserService = currentUserService; } } diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java index e2e78e814..21b37cb82 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java +++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java @@ -1,7 +1,7 @@ package org.argeo.security.ui.dialogs; import org.argeo.ArgeoException; -import org.argeo.security.ArgeoSecurityService; +import org.argeo.security.CurrentUserService; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; @@ -17,10 +17,10 @@ import org.eclipse.swt.widgets.Text; /** Dialog to change the current user password */ public class ChangePasswordDialog extends TitleAreaDialog { private Text currentPassword, newPassword1, newPassword2; - private ArgeoSecurityService securityService; + private CurrentUserService securityService; public ChangePasswordDialog(Shell parentShell, - ArgeoSecurityService securityService) { + CurrentUserService securityService) { super(parentShell); this.securityService = securityService; } diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml index b9a026858..4ea50012f 100644 --- a/security/plugins/pom.xml +++ b/security/plugins/pom.xml @@ -14,6 +14,7 @@ org.argeo.security.equinox org.argeo.security.ui + org.argeo.security.ui.admin org.argeo.security.ui.rcp org.argeo.security.ui.rap diff --git a/security/runtime/org.argeo.security.activemq/build.properties b/security/runtime/org.argeo.security.activemq/build.properties index 5fc538bc8..2c65f866b 100644 --- a/security/runtime/org.argeo.security.activemq/build.properties +++ b/security/runtime/org.argeo.security.activemq/build.properties @@ -1,4 +1,5 @@ -source.. = src/main/java/ +source.. = src/main/java/,\ + src/main/resources/ output.. = target/classes/ bin.includes = META-INF/,\ . diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java index f389145c8..1a5a6cd03 100644 --- a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java +++ b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java @@ -27,6 +27,7 @@ import org.springframework.security.context.SecurityContext; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +@SuppressWarnings("unchecked") public class ActiveMqSecurityBrokerPlugin extends BrokerPluginSupport { // private final static Log log = LogFactory // .getLog(ActiveMqSecurityBrokerPlugin.class); diff --git a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml index 8288ab5d7..c1a1d6b15 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml +++ b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml @@ -72,7 +72,6 @@ propClass = pd.getPropertyType(); if (log.isTraceEnabled()) log.trace("Load " + prop + ", propClass=" + propClass @@ -222,7 +222,7 @@ public class BeanNodeMapper implements NodeMapper { continue nodes; PropertyDescriptor pd = beanWrapper.getPropertyDescriptor(name); - Class propClass = pd.getPropertyType(); + Class propClass = pd.getPropertyType(); // objects list if (propClass != null && List.class.isAssignableFrom(propClass)) { @@ -284,7 +284,7 @@ public class BeanNodeMapper implements NodeMapper { if (classProperty.equals(key)) continue keyProps; - Class keyPropClass = classFromProperty(keyProp); + Class keyPropClass = classFromProperty(keyProp); if (keyPropClass != null) { Object mapValue = asObject(keyProp.getValue(), keyPropClass);