From: Mathieu Baudier Date: Fri, 2 Jan 2015 16:06:34 +0000 (+0000) Subject: All Commons modules building (Eclipse included) X-Git-Tag: argeo-commons-2.1.30~464^2~13 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=4b56d461613392a3808d886d5373cf46b65a040e;p=lgpl%2Fargeo-commons.git All Commons modules building (Eclipse included) git-svn-id: https://svn.argeo.org/commons/branches/mbaudier.2.tp@7613 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/dep/org.argeo.eclipse.dep.rap/pom.xml b/dep/org.argeo.eclipse.dep.rap/pom.xml index 03c92bd40..bffe283c6 100644 --- a/dep/org.argeo.eclipse.dep.rap/pom.xml +++ b/dep/org.argeo.eclipse.dep.rap/pom.xml @@ -106,14 +106,14 @@ - - org.argeo.tp - org.apache.commons.io - - - org.argeo.tp - org.apache.commons.fileupload - + + + + + + + + @@ -122,10 +122,10 @@ - - org.argeo.tp.rap - org.eclipse.equinox.security - + + + + diff --git a/dep/org.argeo.eclipse.dep.rcp/pom.xml b/dep/org.argeo.eclipse.dep.rcp/pom.xml index bc38722cb..7e934cdda 100644 --- a/dep/org.argeo.eclipse.dep.rcp/pom.xml +++ b/dep/org.argeo.eclipse.dep.rcp/pom.xml @@ -55,15 +55,15 @@ ex=*.source_*.jar,\ ]]> - - org.argeo.tp - org.eclipse.osgi - + + + + org.argeo.tp.rcp.platform binaries - ${version.argeo-distribution} + ${version.eclipseIde} pom @@ -204,29 +204,29 @@ ex=*.source_*.jar,\ - - org.argeo.tp.rcp - org.eclipse.equinox.security - + + + + - - - - org.argeo.tp.rcp - binaries - ${version.argeo-distribution} - pom - import - - - org.argeo.tp.rcp.platform - binaries - ${version.argeo-distribution} - pom - import - - - + + + + + + + + + + + + + + + + + + check-osgi diff --git a/dep/pom.xml b/dep/pom.xml index f247acdd2..3d4856ae4 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -12,17 +12,17 @@ Commons Base Dependencies pom - org.argeo.dep.log4j - org.argeo.dep.jackrabbit + + org.argeo.eclipse.dep.rap org.argeo.eclipse.dep.rwt org.argeo.eclipse.dep.rcp - org.argeo.server.dep.ads - org.argeo.server.dep.jackrabbit.server - org.argeo.security.dep.node - org.argeo.security.dep.node.rap - org.argeo.security.dep.node.rcp - org.argeo.dep.cms + + + + + + diff --git a/org.argeo.cms/META-INF/spring/osgi.xml b/org.argeo.cms/META-INF/spring/osgi.xml index 3a103ce87..4b5178779 100644 --- a/org.argeo.cms/META-INF/spring/osgi.xml +++ b/org.argeo.cms/META-INF/spring/osgi.xml @@ -11,7 +11,7 @@ filter="(argeo.jcr.repository.alias=node)" /> + interface="org.springframework.security.core.AuthenticationManager" /> diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 4833692aa..e4cfc84d0 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -56,10 +56,10 @@ - - org.argeo.tp - org.springframework.osgi.core - + + + + org.argeo.tp.rap.platform org.eclipse.osgi diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java index 8d68fc120..6043980e9 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -19,7 +19,7 @@ import org.eclipse.rap.rwt.client.service.BrowserNavigationEvent; import org.eclipse.rap.rwt.client.service.BrowserNavigationListener; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.context.SecurityContextHolder; /** Manages history and navigation */ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint diff --git a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java index afb915d24..af8fa1c99 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java @@ -9,6 +9,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.eclipse.gemini.blueprint.context.BundleContextAware; import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.application.Application.OperationMode; import org.eclipse.rap.rwt.application.ApplicationConfiguration; @@ -20,7 +21,6 @@ import org.eclipse.rap.rwt.lifecycle.PhaseId; import org.eclipse.rap.rwt.lifecycle.PhaseListener; import org.eclipse.rap.rwt.service.ResourceLoader; import org.osgi.framework.BundleContext; -import org.springframework.osgi.context.BundleContextAware; /** Configures an Argeo CMS RWT application. */ public class CmsApplication implements CmsConstants, ApplicationConfiguration, diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLink.java b/org.argeo.cms/src/org/argeo/cms/CmsLink.java index 753d7f503..5ccfd63e3 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsLink.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsLink.java @@ -9,6 +9,7 @@ import javax.jcr.Node; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.eclipse.gemini.blueprint.context.BundleContextAware; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; import org.eclipse.swt.SWT; @@ -20,7 +21,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.osgi.framework.BundleContext; import org.springframework.beans.factory.InitializingBean; -import org.springframework.osgi.context.BundleContextAware; /** A link to an internal or external location. */ public class CmsLink implements CmsUiProvider, InitializingBean, diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java index 7c4dd5f4b..ac63351e3 100644 --- a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java +++ b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java @@ -1,16 +1,18 @@ package org.argeo.cms; +import java.util.Collections; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationManager; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; /** Gateway for user login, can also generate the related UI. */ public class CmsLogin { @@ -21,8 +23,8 @@ public class CmsLogin { protected void logInAsAnonymous() { // TODO Better deal with anonymous authentication try { - GrantedAuthority[] anonAuthorities = { new GrantedAuthorityImpl( - "ROLE_ANONYMOUS") }; + List anonAuthorities = Collections + .singletonList(new SimpleGrantedAuthority("ROLE_ANONYMOUS")); UserDetails anonUser = new User("anonymous", "", true, true, true, true, anonAuthorities); AnonymousAuthenticationToken anonToken = new AnonymousAuthenticationToken( diff --git a/org.argeo.cms/src/org/argeo/cms/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/UserMenu.java index 57de51526..da48237fa 100644 --- a/org.argeo.cms/src/org/argeo/cms/UserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/UserMenu.java @@ -14,7 +14,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.context.SecurityContextHolder; /** The site-related user menu */ public class UserMenu extends Shell implements CmsStyles { diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java index 204158a75..8efcba261 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserRolesPart.java @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; /** Display a single user main info once it has been created. */ public class UserRolesPart extends StyledControl implements EditablePart, diff --git a/org.argeo.cms/src/org/argeo/cms/users/Users.java b/org.argeo.cms/src/org/argeo/cms/users/Users.java index 4336a23d8..cc164b769 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/Users.java +++ b/org.argeo.cms/src/org/argeo/cms/users/Users.java @@ -40,7 +40,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.springframework.security.userdetails.UserDetailsManager; +import org.springframework.security.provisioning.UserDetailsManager; /** * Simple page to manage users of a given repository. We still rely on Argeo diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml index 1d083187c..576cddf2b 100644 --- a/org.argeo.eclipse.ui.rap/pom.xml +++ b/org.argeo.eclipse.ui.rap/pom.xml @@ -34,9 +34,9 @@ org.argeo.util 2.1.12-SNAPSHOT - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + \ No newline at end of file diff --git a/org.argeo.eclipse.ui.rcp/pom.xml b/org.argeo.eclipse.ui.rcp/pom.xml index ed2d76185..280496761 100644 --- a/org.argeo.eclipse.ui.rcp/pom.xml +++ b/org.argeo.eclipse.ui.rcp/pom.xml @@ -30,18 +30,18 @@ - - org.argeo.tp - org.apache.commons.io - + + + + org.argeo.commons org.argeo.util 2.1.12-SNAPSHOT - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + \ No newline at end of file diff --git a/org.argeo.eclipse.ui/bnd.bnd b/org.argeo.eclipse.ui/bnd.bnd index 9fe6f10f1..32bfbc1ad 100644 --- a/org.argeo.eclipse.ui/bnd.bnd +++ b/org.argeo.eclipse.ui/bnd.bnd @@ -9,6 +9,7 @@ Import-Package: org.eclipse.core.commands,\ org.springframework.core.io.support,\ org.springframework.dao,\ javax.jcr.nodetype,\ + org.springframework.security.core,\ * # Was: diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 116174d0e..7aa21aa97 100644 --- a/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.eclipse.ui/pom.xml @@ -30,38 +30,34 @@ org.argeo.util 2.1.12-SNAPSHOT - - org.argeo.commons org.argeo.server.jcr 2.1.12-SNAPSHOT - - - - org.argeo.tp - org.springframework.osgi.extender - - - - - org.argeo.tp - org.springframework.context - - - org.argeo.commons org.argeo.security.core 2.1.12-SNAPSHOT + + + + + + + + + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + \ No newline at end of file diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/ChangePasswordDialog.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/ChangePasswordDialog.java index 09fbc18d6..6c492ce97 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/ChangePasswordDialog.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/ChangePasswordDialog.java @@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.springframework.security.userdetails.UserDetailsManager; +import org.springframework.security.provisioning.UserDetailsManager; /** Dialog to change the current user password */ public class ChangePasswordDialog extends TitleAreaDialog { diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/UserCreationWizard.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/UserCreationWizard.java index 24ea3cb4c..ac7f0cee5 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/UserCreationWizard.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/UserCreationWizard.java @@ -15,6 +15,8 @@ */ package org.argeo.eclipse.ui.dialogs; +import java.util.ArrayList; + import javax.jcr.Node; import javax.jcr.Property; import javax.jcr.RepositoryException; @@ -39,9 +41,9 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** Wizard to create a new user */ public class UserCreationWizard extends Wizard { @@ -80,7 +82,7 @@ public class UserCreationWizard extends Wizard { String password = mainUserInfo.getPassword(); // TODO add roles JcrUserDetails jcrUserDetails = new JcrUserDetails(userProfile, - password, new GrantedAuthority[0]); + password, new ArrayList()); session.save(); session.getWorkspace().getVersionManager() .checkin(userProfile.getPath()); diff --git a/org.argeo.security.equinox/META-INF/spring/osgi.xml b/org.argeo.security.equinox/META-INF/spring/osgi.xml index 8003fb277..9e411ea00 100644 --- a/org.argeo.security.equinox/META-INF/spring/osgi.xml +++ b/org.argeo.security.equinox/META-INF/spring/osgi.xml @@ -9,6 +9,6 @@ osgi:default-timeout="30000"> \ No newline at end of file diff --git a/org.argeo.security.equinox/pom.xml b/org.argeo.security.equinox/pom.xml index 93d0bb2d5..b5d80a722 100644 --- a/org.argeo.security.equinox/pom.xml +++ b/org.argeo.security.equinox/pom.xml @@ -43,10 +43,10 @@ - - org.argeo.tp - org.eclipse.osgi - + + + + @@ -77,9 +77,9 @@ - - org.argeo.tp - org.springframework.security.core - + + + + \ No newline at end of file diff --git a/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java b/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java index 1a7ebb4d7..09f86b798 100644 --- a/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java +++ b/org.argeo.security.equinox/src/org/argeo/security/equinox/OsSpringLoginModule.java @@ -22,10 +22,10 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import org.argeo.security.OsAuthenticationToken; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationManager; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.jaas.SecurityContextLoginModule; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.jaas.SecurityContextLoginModule; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; /** Login module which caches one subject per thread. */ public class OsSpringLoginModule extends SecurityContextLoginModule { diff --git a/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java b/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java index 6fd179ead..f07a203ff 100644 --- a/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java +++ b/org.argeo.security.equinox/src/org/argeo/security/equinox/SpringLoginModule.java @@ -15,6 +15,8 @@ */ package org.argeo.security.equinox; +import java.util.Collections; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.UUID; @@ -31,14 +33,13 @@ import org.apache.commons.logging.LogFactory; import org.argeo.security.NodeAuthenticationToken; import org.argeo.util.LocaleCallback; import org.argeo.util.LocaleUtils; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationManager; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; -import org.springframework.security.providers.jaas.SecurityContextLoginModule; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.jaas.SecurityContextLoginModule; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; /** Login module which caches one subject per thread. */ public class SpringLoginModule extends SecurityContextLoginModule { @@ -109,8 +110,8 @@ public class SpringLoginModule extends SecurityContextLoginModule { // TODO integrate with JCR? Object principal = UUID.randomUUID().toString(); - GrantedAuthority[] authorities = { new GrantedAuthorityImpl( - anonymousRole) }; + List authorities = Collections + .singletonList(new SimpleGrantedAuthority(anonymousRole)); AnonymousAuthenticationToken anonymousToken = new AnonymousAuthenticationToken( key, principal, authorities); Authentication auth = authenticationManager diff --git a/org.argeo.security.ui.admin/pom.xml b/org.argeo.security.ui.admin/pom.xml index e96324d29..d80eb1640 100644 --- a/org.argeo.security.ui.admin/pom.xml +++ b/org.argeo.security.ui.admin/pom.xml @@ -52,16 +52,16 @@ - - org.argeo.tp - org.springframework.security.core - + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - - + + + + + \ No newline at end of file diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java index 990c4ac82..86ae86ae9 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java @@ -15,6 +15,8 @@ */ package org.argeo.security.ui.admin.editors; +import java.util.ArrayList; + import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -33,7 +35,7 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.editor.FormEditor; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; /** Editor for an Argeo user. */ public class ArgeoUserEditor extends FormEditor { @@ -64,10 +66,9 @@ public class ArgeoUserEditor extends FormEditor { + username, e); } } else { - GrantedAuthority[] authorities = {}; try { userDetails = new JcrUserDetails(session, username, null, - authorities); + new ArrayList()); } catch (RepositoryException e) { throw new ArgeoException("Cannot retrieve disabled JCR profile"); } diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java index 08cd457ad..ee7262a95 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java @@ -42,8 +42,8 @@ import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.editor.FormPage; import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; /** * Display/edit the roles of a user. diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java index 1bd8e8f1c..af1f3d93b 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java @@ -30,8 +30,8 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; public class MainUserInfoWizardPage extends WizardPage implements ModifyListener, ArgeoNames { diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java index df16aeab4..83f4c4851 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/NewUserWizard.java @@ -15,6 +15,8 @@ */ package org.argeo.security.ui.admin.wizards; +import java.util.ArrayList; + import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -28,7 +30,7 @@ import org.argeo.security.UserAdminService; import org.argeo.security.jcr.JcrSecurityModel; import org.argeo.security.jcr.JcrUserDetails; import org.eclipse.jface.wizard.Wizard; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; /** Wizard to create a new user */ public class NewUserWizard extends Wizard { @@ -69,7 +71,7 @@ public class NewUserWizard extends Wizard { String password = mainUserInfo.getPassword(); // TODO add roles JcrUserDetails jcrUserDetails = new JcrUserDetails(userProfile, - password, new GrantedAuthority[0]); + password, new ArrayList()); session.save(); session.getWorkspace().getVersionManager() .checkin(userProfile.getPath()); diff --git a/org.argeo.security.ui.rap/pom.xml b/org.argeo.security.ui.rap/pom.xml index 517d05f26..ea6aa46d5 100644 --- a/org.argeo.security.ui.rap/pom.xml +++ b/org.argeo.security.ui.rap/pom.xml @@ -54,10 +54,10 @@ - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/LogoutEntryPoint.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/LogoutEntryPoint.java index 733754901..7a9e6f3a5 100644 --- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/LogoutEntryPoint.java +++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/LogoutEntryPoint.java @@ -23,7 +23,7 @@ import org.eclipse.equinox.security.auth.ILoginContext; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.IEntryPoint; import org.eclipse.ui.PlatformUI; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.context.SecurityContextHolder; /** * RAP entry point which logs out the currently authenticated user diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java index 480815279..eb1dd80ee 100644 --- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java +++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java @@ -29,7 +29,6 @@ import org.eclipse.ui.application.ActionBarAdvisor; import org.eclipse.ui.application.IActionBarConfigurer; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.application.WorkbenchWindowAdvisor; -import org.eclipse.ui.internal.UIPlugin; /** Eclipse RAP specific window advisor */ public class RapWindowAdvisor extends WorkbenchWindowAdvisor { @@ -60,14 +59,15 @@ public class RapWindowAdvisor extends WorkbenchWindowAdvisor { configurer.setShellStyle(SWT.NO_TRIM); Rectangle bounds = Display.getCurrent().getBounds(); configurer.setInitialSize(new Point(bounds.width, bounds.height)); - - // Handle window resize in Rap 2.1+ see https://bugs.eclipse.org/bugs/show_bug.cgi?id=417254 + + // Handle window resize in Rap 2.1+ see + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=417254 Display.getCurrent().addListener(SWT.Resize, new Listener() { @Override public void handleEvent(Event event) { Rectangle bounds = event.display.getBounds(); - IWorkbenchWindow iww = UIPlugin.getDefault().getWorkbench() - .getActiveWorkbenchWindow(); + IWorkbenchWindow iww = getWindowConfigurer().getWindow() + .getWorkbench().getActiveWorkbenchWindow(); iww.getShell().setBounds(bounds); } }); diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java index a635de186..c3754ed05 100644 --- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java +++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java @@ -33,9 +33,9 @@ import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.IEntryPoint; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.context.SecurityContext; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; /** * RAP entry point with login capabilities. Once the user has been diff --git a/org.argeo.security.ui.rcp/pom.xml b/org.argeo.security.ui.rcp/pom.xml index 8ab159181..8c250929f 100644 --- a/org.argeo.security.ui.rcp/pom.xml +++ b/org.argeo.security.ui.rcp/pom.xml @@ -33,10 +33,10 @@ - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml index 06778ec71..1d0164e6c 100644 --- a/org.argeo.security.ui/pom.xml +++ b/org.argeo.security.ui/pom.xml @@ -41,13 +41,13 @@ org.argeo.util 2.1.12-SNAPSHOT - - org.argeo.tp - org.springframework.security.core - - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + + + + + \ No newline at end of file diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/PrivilegedJob.java b/org.argeo.security.ui/src/org/argeo/security/ui/PrivilegedJob.java index 1ded50fdb..f66ef2b60 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/PrivilegedJob.java +++ b/org.argeo.security.ui/src/org/argeo/security/ui/PrivilegedJob.java @@ -8,8 +8,8 @@ import javax.security.auth.Subject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; -import org.springframework.security.Authentication; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; /** * Propagate authentication to an eclipse job. Typically to execute a privileged diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java b/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java index f1bb093ec..f652ccde4 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java +++ b/org.argeo.security.ui/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java @@ -22,7 +22,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.ui.handlers.HandlerUtil; -import org.springframework.security.userdetails.UserDetailsManager; +import org.springframework.security.provisioning.UserDetailsManager; /** Opens the change password dialog. */ public class OpenChangePasswordDialog extends AbstractHandler { diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/internal/CurrentUser.java b/org.argeo.security.ui/src/org/argeo/security/ui/internal/CurrentUser.java index 43ca5884e..944bc2321 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/internal/CurrentUser.java +++ b/org.argeo.security.ui/src/org/argeo/security/ui/internal/CurrentUser.java @@ -24,8 +24,8 @@ import java.util.Set; import javax.security.auth.Subject; import org.argeo.ArgeoException; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; /** * Retrieves information about the current user. Not an API, can change without diff --git a/org.argeo.security.ui/src/org/argeo/security/ui/views/UserProfile.java b/org.argeo.security.ui/src/org/argeo/security/ui/views/UserProfile.java index 3f1f000bf..e18deb40b 100644 --- a/org.argeo.security.ui/src/org/argeo/security/ui/views/UserProfile.java +++ b/org.argeo.security.ui/src/org/argeo/security/ui/views/UserProfile.java @@ -30,7 +30,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.part.ViewPart; -import org.springframework.security.Authentication; +import org.springframework.security.core.Authentication; /** Information about the currently logged in user */ public class UserProfile extends ViewPart { diff --git a/pom.xml b/pom.xml index 642c4801f..6f17d12de 100644 --- a/pom.xml +++ b/pom.xml @@ -45,25 +45,25 @@ - - - + org.argeo.eclipse.ui + org.argeo.eclipse.ui.rap + org.argeo.eclipse.ui.rcp - - + org.argeo.node.repo.jackrabbit + org.argeo.cms - - - - + org.argeo.eclipse.ui.workbench + org.argeo.security.equinox + org.argeo.security.ui + org.argeo.security.ui.admin - - + org.argeo.security.ui.rap + org.argeo.security.ui.rcp - + dep @@ -455,27 +455,27 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - + + org.argeo.tp.rcp.platform + binaries + ${version.eclipseIde} + pom + import + + + org.argeo.tp.rap.addons + binaries + ${version.rap.addons} + pom + import + + + org.argeo.tp.rap.platform + binaries + ${version.rap} + pom + import + @@ -499,7 +499,7 @@ limitations under the License. argeo-tp-rap - http://localhost:7080/data/public/java/eclipse-rap-2.2 + http://repo.argeo.org/data/public/java/eclipse-rap-2.2 true daily