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 03c92bd4031f13da269786db8de985d60ab9d8c8..bffe283c6fff3a2f92e34cae7a8edebc1a4c1724 100644 (file)
--- a/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -106,14 +106,14 @@
                </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> -->
@@ -122,10 +122,10 @@
                <!-- </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>

diff --git a/dep/org.argeo.eclipse.dep.rcp/pom.xml b/dep/org.argeo.eclipse.dep.rcp/pom.xml
index bc38722cb7f5c7fb597f97f5a1913246a4ad3141..7e934cdda04bc21fae09454865fc1d016261d9f2 100644 (file)
--- 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,\
 
        ]]></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 -->
@@ -204,29 +204,29 @@ ex=*.source_*.jar,\
                </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>

diff --git a/dep/pom.xml b/dep/pom.xml
index f247acdd28d6bf0ad2363070b6fb47942b7194bc..3d4856ae4b5e9cce275eff8c3bdaa8e4fad929e6 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -12,17 +12,17 @@
        <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>

diff --git a/org.argeo.cms/META-INF/spring/osgi.xml b/org.argeo.cms/META-INF/spring/osgi.xml
index 3a103ce874f71cd0f81cea11aae83f398bb70f88..4b517877907704f3d894e5eefc25f67f8ac73dc3 100644 (file)
--- 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)" />\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

diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index 4833692aa5b01962f80ee5a5e2bab5651fcf4d02..e4cfc84d08988e74d44405f9b9ffe8930750a8a3 100644 (file)
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -56,10 +56,10 @@
 
 
                <!-- 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>

diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
index 8d68fc1208ab17d35b3b7727368a2efd89bfc867..6043980e90f8b58a927e45da360027dab298cad2 100644 (file)
--- 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 afb915d249d6c0426e9eb1710d2a7be2503a741a..af8fa1c99fc25963aa302535afe16d34d7a0c6e0 100644 (file)
--- 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 753d7f503803f1e558af0518b080e44de632e1f7..5ccfd63e3789160fa8c377063089327b637cfe5c 100644 (file)
--- 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 7c4dd5f4b3ac7e855ce3025952d75e6679e303a1..ac63351e3d65a9844d34e2a9664921edd879c4a5 100644 (file)
--- 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<SimpleGrantedAuthority> 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 57de51526000f8ef995eb76221e71f373498dd4e..da48237fa61499b7366bb85e239f75ef94593f4d 100644 (file)
--- 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 204158a75ac22ed645d756e63ed29c74d36a57e8..8efcba26113a67301097c7fe93243487a913d42d 100644 (file)
--- 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 4336a23d80b33861bbb3bfc144fd61cbcd64e09d..cc164b7692c88b390068cc6f05e06e8d89d0c82a 100644 (file)
--- 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 1d083187c07f48db8e331320ec70676202ac42d7..576cddf2bf0d88e85fd69614882e0feae1c7aa87 100644 (file)
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -34,9 +34,9 @@
                        <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

diff --git a/org.argeo.eclipse.ui.rcp/pom.xml b/org.argeo.eclipse.ui.rcp/pom.xml
index ed2d761852c02af483caf54a0b9a7aa446f77013..2804967613a15567ac7d094475e1bd67e42debbd 100644 (file)
--- a/org.argeo.eclipse.ui.rcp/pom.xml
+++ b/org.argeo.eclipse.ui.rcp/pom.xml
@@ -30,18 +30,18 @@
                </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

diff --git a/org.argeo.eclipse.ui/bnd.bnd b/org.argeo.eclipse.ui/bnd.bnd
index 9fe6f10f1fd995d9639c88d1de1372223997baf7..32bfbc1ade358b5ec61d7a6a49249eeaa260fb7f 100644 (file)
--- 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 116174d0ecb99fefb8913a922ccd81e01b28e42a..7aa21aa975176fdc56bc0439f04a15a7dabca369 100644 (file)
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -30,38 +30,34 @@
                        <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

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 09fbc18d60c080c256942daa47bd8101692f9e49..6c492ce97cf78d7d8427498bdbfc82bbfdaedadb 100644 (file)
--- 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 24ea3cb4c42cb6ffaa1ef6c3ad57c08c122ea029..ac7f0cee516a0fbab6a2e3d7eb39b5292fbf97e5 100644 (file)
--- 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<GrantedAuthority>());
                        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 8003fb2772de907626e389269338053eaabc7553..9e411ea00cee70fa9fae5c262533a9a67b972131 100644 (file)
--- 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">\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

diff --git a/org.argeo.security.equinox/pom.xml b/org.argeo.security.equinox/pom.xml
index 93d0bb2d52931202ffda1fc957d83bc947deb64e..b5d80a7224a80b70eda5a5a15cd379aa6553da6a 100644 (file)
--- a/org.argeo.security.equinox/pom.xml
+++ b/org.argeo.security.equinox/pom.xml
@@ -43,10 +43,10 @@
        <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>
@@ -77,9 +77,9 @@
                </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

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 1a7ebb4d7e8ba82952633bff32a2ff6b3907256b..09f86b798effea7dcd8a36e6820a3860fc6146de 100644 (file)
--- 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 6fd179ead504175877ea5eb0dc60391279aa0051..f07a203ffbe3d9a70c12c32e3e3f22d26acc3428 100644 (file)
--- 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<SimpleGrantedAuthority> 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 e96324d292441b848b04e5c4a0ecae1d560a0174..d80eb164030fc171dfbdb54c2dff308cde79ea8a 100644 (file)
--- a/org.argeo.security.ui.admin/pom.xml
+++ b/org.argeo.security.ui.admin/pom.xml
@@ -52,16 +52,16 @@
                </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

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 990c4ac82f1bd26d5d0e36d8e1e7ec5091d62920..86ae86ae94a7ea5539299a84da7d1ca24dfd04ef 100644 (file)
--- 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<GrantedAuthority>());
                        } 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 08cd457ad326ab4830797b6ba24682704bf4a80d..ee7262a95bdc94b5c7f28c2ea5ba8fac66c37599 100644 (file)
--- 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 1bd8e8f1c3f201a560fd372417cbbc2f2d0e2097..af1f3d93b15002a05f82f7ab512d68b7594f8940 100644 (file)
--- 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 df16aeab49e4a4b417f12494b21add1545fe8114..83f4c485125526060c9d05050091f891d9e6d973 100644 (file)
--- 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<GrantedAuthority>());
                        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 517d05f261c3d2039b498bf5ca5a8cc4be3f2cbc..ea6aa46d52edb7ead0ddac6b8669c6b3d08f37ab 100644 (file)
--- a/org.argeo.security.ui.rap/pom.xml
+++ b/org.argeo.security.ui.rap/pom.xml
@@ -54,10 +54,10 @@
                </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>

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 733754901a229db1978298139128114f75fd2800..7a9e6f3a55e22b64318aaa12c28e7882ce3955bd 100644 (file)
--- 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 4808152797cf44d90eff36d9e28586b02209c5e6..eb1dd80ee4e9c50ad9e9d6895631fb7ed493ff28 100644 (file)
--- 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 a635de186ce5c0859a553bf5daebd964b355802f..c3754ed05cf89ef6fc1ca42ad75ae513c4400733 100644 (file)
--- 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 8ab159181057732395054675460251afbb450f0f..8c250929fb08055f05e94cf2101541c26c895fb5 100644 (file)
--- a/org.argeo.security.ui.rcp/pom.xml
+++ b/org.argeo.security.ui.rcp/pom.xml
@@ -33,10 +33,10 @@
                </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>

diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml
index 06778ec71b9fd47ffec14516f07294e640914fbf..1d0164e6c5c65359102141d6a1db263e5e6f95fe 100644 (file)
--- a/org.argeo.security.ui/pom.xml
+++ b/org.argeo.security.ui/pom.xml
@@ -41,13 +41,13 @@
                        <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

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 1ded50fdb8eda0238cb3d46dc880a17ae63c85dd..f66ef2b6011f7ad70b25f2030bbcaf39d07ae462 100644 (file)
--- 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 f1bb093ec9e2ff4243956572d0a1781b5061a7f0..f652ccde4c95060f63e0dd12dfe4fd1e9db5f57b 100644 (file)
--- 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 43ca5884e968573e4c52633990f704664cdbf36d..944bc2321e8e9387fbda0366e44361c29dc32ff6 100644 (file)
--- 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 3f1f000bff9600bf32cca041270bf600173ace6f..e18deb40b3f4cf5c6bd9fc71e6d1b7cab3c08bc3 100644 (file)
--- 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 642c4801f1f77a340e59d051d70f5acb28433af6..6f17d12de125fc5069e03ec174c4f1d900598e15 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,25 +45,25 @@
                <!-- <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>
@@ -455,27 +455,27 @@ limitations under the License.
                        <!-- <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>
@@ -499,7 +499,7 @@ limitations under the License.
                </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>