X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FNewUser.java;h=660896de8a493cf1c0522bf037d569b8b6dfe85a;hb=368bd27f3da5356a1e45ae3645f64e674eb89904;hp=dab1b4ce7efba5b5a6f14c0f49e4df055b7636a4;hpb=0450e423bd759c9e27b43044670e659271392d71;p=lgpl%2Fargeo-commons.git diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java index dab1b4ce7..660896de8 100644 --- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java +++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/NewUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2012 Mathieu Baudier + * Copyright (C) 2007-2012 Argeo GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,10 @@ */ package org.argeo.security.ui.admin.commands; +import javax.jcr.Repository; import javax.jcr.Session; +import org.argeo.jcr.JcrUtils; import org.argeo.security.UserAdminService; import org.argeo.security.jcr.JcrSecurityModel; import org.argeo.security.ui.admin.wizards.NewUserWizard; @@ -26,27 +28,31 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.handlers.HandlerUtil; -/** Command handler to set visible or open a Argeo user. */ +/** Launch a wizard that enables creation of a new user. */ public class NewUser extends AbstractHandler { - private Session session; + private Repository repository; private UserAdminService userAdminService; private JcrSecurityModel jcrSecurityModel; public Object execute(ExecutionEvent event) throws ExecutionException { + Session session = null; try { + session = repository.login(); NewUserWizard newUserWizard = new NewUserWizard(session, - userAdminService,jcrSecurityModel); + userAdminService, jcrSecurityModel); WizardDialog dialog = new WizardDialog( HandlerUtil.getActiveShell(event), newUserWizard); dialog.open(); } catch (Exception e) { throw new ExecutionException("Cannot open wizard", e); + } finally { + JcrUtils.logoutQuietly(session); } return null; } - public void setSession(Session session) { - this.session = session; + public void setRepository(Repository repository) { + this.repository = repository; } public void setUserAdminService(UserAdminService userAdminService) {