</dependency>
<!-- Needed by upload -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.apache.commons.io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.apache.commons.fileupload</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.apache.commons.io</artifactId> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.apache.commons.fileupload</artifactId> -->
+<!-- </dependency> -->
<!-- RAP Specific Dependencies -->
<!-- <dependency> -->
<!-- </dependency> -->
<!-- Security -->
- <dependency>
- <groupId>org.argeo.tp.rap</groupId>
- <artifactId>org.eclipse.equinox.security</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.rap</groupId> -->
+<!-- <artifactId>org.eclipse.equinox.security</artifactId> -->
+<!-- </dependency> -->
</dependencies>
<profiles>
]]></description>
<dependencies>
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.eclipse.osgi</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.argeo.tp.rcp.platform</groupId>
<artifactId>binaries</artifactId>
- <version>${version.argeo-distribution}</version>
+ <version>${version.eclipseIde}</version>
<type>pom</type>
<exclusions>
<!-- Deprecated update configurator has side effect in PDE -->
</dependency>
<!-- Security -->
- <dependency>
- <groupId>org.argeo.tp.rcp</groupId>
- <artifactId>org.eclipse.equinox.security</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.rcp</groupId> -->
+<!-- <artifactId>org.eclipse.equinox.security</artifactId> -->
+<!-- </dependency> -->
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.argeo.tp.rcp</groupId>
- <artifactId>binaries</artifactId>
- <version>${version.argeo-distribution}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp.rcp.platform</groupId>
- <artifactId>binaries</artifactId>
- <version>${version.argeo-distribution}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+<!-- <dependencyManagement> -->
+<!-- <dependencies> -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.rcp</groupId> -->
+<!-- <artifactId>binaries</artifactId> -->
+<!-- <version>${version.argeo-distribution}</version> -->
+<!-- <type>pom</type> -->
+<!-- <scope>import</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp.rcp.platform</groupId> -->
+<!-- <artifactId>binaries</artifactId> -->
+<!-- <version>${version.argeo-distribution}</version> -->
+<!-- <type>pom</type> -->
+<!-- <scope>import</scope> -->
+<!-- </dependency> -->
+<!-- </dependencies> -->
+<!-- </dependencyManagement> -->
<profiles>
<profile>
<id>check-osgi</id>
<name>Commons Base Dependencies</name>
<packaging>pom</packaging>
<modules>
- <module>org.argeo.dep.log4j</module>
- <module>org.argeo.dep.jackrabbit</module>
+<!-- <module>org.argeo.dep.log4j</module> -->
+<!-- <module>org.argeo.dep.jackrabbit</module> -->
<module>org.argeo.eclipse.dep.rap</module>
<module>org.argeo.eclipse.dep.rwt</module>
<module>org.argeo.eclipse.dep.rcp</module>
- <module>org.argeo.server.dep.ads</module>
- <module>org.argeo.server.dep.jackrabbit.server</module>
- <module>org.argeo.security.dep.node</module>
- <module>org.argeo.security.dep.node.rap</module>
- <module>org.argeo.security.dep.node.rcp</module>
- <module>org.argeo.dep.cms</module>
+<!-- <module>org.argeo.server.dep.ads</module> -->
+<!-- <module>org.argeo.server.dep.jackrabbit.server</module> -->
+<!-- <module>org.argeo.security.dep.node</module> -->
+<!-- <module>org.argeo.security.dep.node.rap</module> -->
+<!-- <module>org.argeo.security.dep.node.rcp</module> -->
+<!-- <module>org.argeo.dep.cms</module> -->
</modules>
<profiles>
<profile>
filter="(argeo.jcr.repository.alias=node)" />\r
\r
<reference id="authenticationManager"\r
- interface="org.springframework.security.AuthenticationManager" />\r
+ interface="org.springframework.security.core.AuthenticationManager" />\r
\r
<!-- SERVICES -->\r
<service ref="cmsRepository" interface="javax.jcr.Repository">\r
<!-- OSGi -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.springframework.osgi.core</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.springframework.osgi.core</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.argeo.tp.rap.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
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
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;
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,
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;
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,
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 {
protected void logInAsAnonymous() {
// TODO Better deal with anonymous authentication
try {
- GrantedAuthority[] anonAuthorities = { new GrantedAuthorityImpl(
- "ROLE_ANONYMOUS") };
+ List<SimpleGrantedAuthority> anonAuthorities = Collections
+ .singletonList(new SimpleGrantedAuthority("ROLE_ANONYMOUS"));
UserDetails anonUser = new User("anonymous", "", true, true, true,
true, anonAuthorities);
AnonymousAuthenticationToken anonToken = new AnonymousAuthenticationToken(
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 {
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,
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
<artifactId>org.argeo.util</artifactId>
<version>2.1.12-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- </dependency> -->
</dependencies>
</project>
\ No newline at end of file
</dependency>
<!-- Others. -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.apache.commons.io</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.apache.commons.io</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.util</artifactId>
<version>2.1.12-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- </dependency> -->
</dependencies>
</project>
\ No newline at end of file
org.springframework.core.io.support,\
org.springframework.dao,\
javax.jcr.nodetype,\
+ org.springframework.security.core,\
*
# Was:
<artifactId>org.argeo.util</artifactId>
<version>2.1.12-SNAPSHOT</version>
</dependency>
-
- <!-- JCR -->
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.server.jcr</artifactId>
<version>2.1.12-SNAPSHOT</version>
</dependency>
-
- <!-- Bridge Spring and OSGi -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.springframework.osgi.extender</artifactId>
- </dependency>
-
- <!-- Spring -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.springframework.context</artifactId>
- </dependency>
-
- <!-- Base security -->
<dependency>
<groupId>org.argeo.commons</groupId>
<artifactId>org.argeo.security.core</artifactId>
<version>2.1.12-SNAPSHOT</version>
</dependency>
+ <!-- Bridge Spring and OSGi -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.springframework.osgi.extender</artifactId> -->
+<!-- </dependency> -->
+
+ <!-- Spring -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.springframework.context</artifactId> -->
+<!-- </dependency> -->
+
<!-- Others -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- </dependency> -->
</dependencies>
</project>
\ No newline at end of file
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 {
*/
package org.argeo.eclipse.ui.dialogs;
+import java.util.ArrayList;
+
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
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 {
String password = mainUserInfo.getPassword();
// TODO add roles
JcrUserDetails jcrUserDetails = new JcrUserDetails(userProfile,
- password, new GrantedAuthority[0]);
+ password, new ArrayList<GrantedAuthority>());
session.save();
session.getWorkspace().getVersionManager()
.checkin(userProfile.getPath());
osgi:default-timeout="30000">\r
\r
<reference id="authenticationManager"\r
- interface="org.springframework.security.AuthenticationManager"\r
+ interface="org.springframework.security.core.AuthenticationManager"\r
context-class-loader="client" />\r
</beans:beans>
\ No newline at end of file
<dependencies>
<!-- Eclipse -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.eclipse.osgi</artifactId> -->
+<!-- </dependency> -->
<!-- Generic Eclipse Utilities -->
<dependency>
</dependency>
<!-- Spring -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.springframework.security.core</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.springframework.security.core</artifactId> -->
+<!-- </dependency> -->
</dependencies>
</project>
\ No newline at end of file
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 {
*/
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;
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 {
// TODO integrate with JCR?
Object principal = UUID.randomUUID().toString();
- GrantedAuthority[] authorities = { new GrantedAuthorityImpl(
- anonymousRole) };
+ List<SimpleGrantedAuthority> authorities = Collections
+ .singletonList(new SimpleGrantedAuthority(anonymousRole));
AnonymousAuthenticationToken anonymousToken = new AnonymousAuthenticationToken(
key, principal, authorities);
Authentication auth = authenticationManager
</dependency>
<!-- Spring -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.springframework.security.core</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.springframework.security.core</artifactId> -->
+<!-- </dependency> -->
<!-- Others -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging
- </artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging -->
+<!-- </artifactId> -->
+<!-- </dependency> -->
</dependencies>
</project>
\ No newline at end of file
*/
package org.argeo.security.ui.admin.editors;
+import java.util.ArrayList;
+
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
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 {
+ username, e);
}
} else {
- GrantedAuthority[] authorities = {};
try {
userDetails = new JcrUserDetails(session, username, null,
- authorities);
+ new ArrayList<GrantedAuthority>());
} catch (RepositoryException e) {
throw new ArgeoException("Cannot retrieve disabled JCR profile");
}
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.
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 {
*/
package org.argeo.security.ui.admin.wizards;
+import java.util.ArrayList;
+
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
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 {
String password = mainUserInfo.getPassword();
// TODO add roles
JcrUserDetails jcrUserDetails = new JcrUserDetails(userProfile,
- password, new GrantedAuthority[0]);
+ password, new ArrayList<GrantedAuthority>());
session.save();
session.getWorkspace().getVersionManager()
.checkin(userProfile.getPath());
</dependency>
<!-- Logging -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- </dependency> -->
<!-- Argeo Security -->
<dependency>
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
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 {
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);
}
});
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
</dependency>
<!-- Logging -->
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- </dependency> -->
<!-- Argeo Security -->
<dependency>
<artifactId>org.argeo.util</artifactId>
<version>2.1.12-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>org.springframework.security.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.argeo.tp</groupId>
- <artifactId>slf4j.org.apache.commons.logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>org.springframework.security.core</artifactId> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.argeo.tp</groupId> -->
+<!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- </dependency> -->
</dependencies>
</project>
\ No newline at end of file
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
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 {
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
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 {
<!-- <module>org.argeo.server.ads</module> -->
<!-- <module>org.argeo.server.ads.server</module> -->
<!-- Eclipse -->
- <!-- <module>org.argeo.eclipse.ui</module> -->
- <!-- <module>org.argeo.eclipse.ui.rap</module> -->
- <!-- <module>org.argeo.eclipse.ui.rcp</module> -->
+ <module>org.argeo.eclipse.ui</module>
+ <module>org.argeo.eclipse.ui.rap</module>
+ <module>org.argeo.eclipse.ui.rcp</module>
<!-- Node -->
- <!-- <module>org.argeo.node.repo.jackrabbit</module> -->
- <!-- <module>org.argeo.cms</module> -->
+ <module>org.argeo.node.repo.jackrabbit</module>
+ <module>org.argeo.cms</module>
<!-- Standard Workbench Perspectives -->
- <!-- <module>org.argeo.eclipse.ui.workbench</module> -->
- <!-- <module>org.argeo.security.equinox</module> -->
- <!-- <module>org.argeo.security.ui</module> -->
- <!-- <module>org.argeo.security.ui.admin</module> -->
+ <module>org.argeo.eclipse.ui.workbench</module>
+ <module>org.argeo.security.equinox</module>
+ <module>org.argeo.security.ui</module>
+ <module>org.argeo.security.ui.admin</module>
<!-- Standard Workbench Products -->
- <!-- <module>org.argeo.security.ui.rap</module> -->
- <!-- <module>org.argeo.security.ui.rcp</module> -->
+ <module>org.argeo.security.ui.rap</module>
+ <module>org.argeo.security.ui.rcp</module>
<!-- Legacy -->
<!-- <module>org.argeo.server.core</module> -->
<!-- <module>org.argeo.ext.jdbm</module> -->
<!-- Dependencies and Distributions -->
- <!-- <module>dep</module> -->
+ <module>dep</module>
<!-- <module>dist</module> -->
</modules>
<scm>
<!-- <type>pom</type> -->
<!-- <scope>import</scope> -->
<!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rcp.platform</groupId> -->
- <!-- <artifactId>binaries</artifactId> -->
- <!-- <version>${version.eclipseIde}</version> -->
- <!-- <type>pom</type> -->
- <!-- <scope>import</scope> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.addons</groupId> -->
- <!-- <artifactId>binaries</artifactId> -->
- <!-- <version>${version.rap.addons}</version> -->
- <!-- <type>pom</type> -->
- <!-- <scope>import</scope> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>binaries</artifactId> -->
- <!-- <version>${version.rap}</version> -->
- <!-- <type>pom</type> -->
- <!-- <scope>import</scope> -->
- <!-- </dependency> -->
+ <dependency>
+ <groupId>org.argeo.tp.rcp.platform</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.eclipseIde}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.rap.addons</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.rap.addons}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.tp.rap.platform</groupId>
+ <artifactId>binaries</artifactId>
+ <version>${version.rap}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<repositories>
</repository>
<repository>
<id>argeo-tp-rap</id>
- <url>http://localhost:7080/data/public/java/eclipse-rap-2.2</url>
+ <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>