From: Mathieu Baudier Date: Fri, 2 Jan 2015 14:56:31 +0000 (+0000) Subject: First working build (without Eclipse) X-Git-Tag: argeo-commons-2.1.30~464^2~14 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=b3b39d5606a0c48d64a804f4aff5459ea3addc31;p=lgpl%2Fargeo-commons.git First working build (without Eclipse) git-svn-id: https://svn.argeo.org/commons/branches/mbaudier.2.tp@7612 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/.project b/.project index e2ee17313..8d67e483c 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - org.argeo.commons + org.argeo.commons-mbaudier diff --git a/org.argeo.osgi.boot/build.properties b/org.argeo.osgi.boot/build.properties index f17a5821b..31b02d2fa 100644 --- a/org.argeo.osgi.boot/build.properties +++ b/org.argeo.osgi.boot/build.properties @@ -1 +1 @@ -additional.bundles = junit +additional.bundles = org.junit diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml index 533576a88..77ef492a5 100644 --- a/org.argeo.osgi.boot/pom.xml +++ b/org.argeo.osgi.boot/pom.xml @@ -22,18 +22,25 @@ - - org.argeo.tp.rap.platform - org.eclipse.osgi - provided - + + + + + + + + + + + + - - org.argeo.tp - junit - test - + + + + + diff --git a/org.argeo.security.core/bnd.bnd b/org.argeo.security.core/bnd.bnd index 2bbd9c3b8..9124816cb 100644 --- a/org.argeo.security.core/bnd.bnd +++ b/org.argeo.security.core/bnd.bnd @@ -1,4 +1,5 @@ Bundle-ActivationPolicy: lazy Import-Package:org.bouncycastle.*;resolution:=optional,\ +org.springframework.util,\ javax.jcr.security,\ * diff --git a/org.argeo.security.core/build.properties b/org.argeo.security.core/build.properties index a25d2eaec..3ad70fd32 100644 --- a/org.argeo.security.core/build.properties +++ b/org.argeo.security.core/build.properties @@ -1,11 +1,6 @@ -additional.bundles = org.springframework.transaction,\ - org.springframework.core,\ - junit,\ - org.apache.commons.io,\ - org.apache.commons.codec,\ - org.springframework.security.core,\ - org.apache.log4j,\ - slf4j.api,\ - slf4j.org.apache.commons.logging source.. = src/,\ ext/test/ +additional.bundles = org.junit,\ + org.slf4j.commons.logging,\ + org.apache.commons.codec,\ + org.springframework.security.core diff --git a/org.argeo.security.core/ext/test/org/argeo/security/PasswordSandbox.java b/org.argeo.security.core/ext/test/org/argeo/security/PasswordSandbox.java index d8a084607..de9a1eb1e 100644 --- a/org.argeo.security.core/ext/test/org/argeo/security/PasswordSandbox.java +++ b/org.argeo.security.core/ext/test/org/argeo/security/PasswordSandbox.java @@ -18,7 +18,7 @@ package org.argeo.security; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; -import org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder; +import org.springframework.security.authentication.encoding.LdapShaPasswordEncoder; public class PasswordSandbox { public static void main(String[] args) { diff --git a/org.argeo.security.core/pom.xml b/org.argeo.security.core/pom.xml index 6a57226b9..f9afbed23 100644 --- a/org.argeo.security.core/pom.xml +++ b/org.argeo.security.core/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.argeo.commons @@ -9,42 +10,6 @@ org.argeo.security.core Commons Security Core - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - - - - lazy - - org.argeo.security.* - - - - org.bouncycastle.*;resolution:=optional, - javax.jcr.security, - *, - - - - - - org.argeo.commons @@ -57,82 +22,90 @@ 2.1.12-SNAPSHOT + + + + + + + + - - org.argeo.tp - bcprov - true - - - org.argeo.tp - org.apache.commons.codec - + + + + + + + + + - - org.argeo.tp - org.springframework.core - - - org.argeo.tp - org.springframework.beans - - - org.argeo.tp - org.springframework.context - - - org.argeo.tp - org.springframework.security.core - - - org.argeo.tp - org.springframework.transaction - + + + + + + + + + + + + + + + + + + + + - - org.argeo.tp - org.eclipse.osgi - provided - + + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + - - org.argeo.tp - org.apache.log4j - true - + + + + + - - org.argeo.tp - junit - test - - - org.argeo.commons - org.argeo.dep.log4j - 2.1.12-SNAPSHOT - pom - test - - - - - - - - - org.argeo.tp - com.springsource.json - test - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.security.core/src/org/argeo/security/NodeAuthenticationToken.java b/org.argeo.security.core/src/org/argeo/security/NodeAuthenticationToken.java index 1870675d8..4a802553b 100644 --- a/org.argeo.security.core/src/org/argeo/security/NodeAuthenticationToken.java +++ b/org.argeo.security.core/src/org/argeo/security/NodeAuthenticationToken.java @@ -15,8 +15,10 @@ */ package org.argeo.security; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import java.util.Collection; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; /** Credentials required for the authentication to a node. */ public class NodeAuthenticationToken extends @@ -39,7 +41,7 @@ public class NodeAuthenticationToken extends /** Authenticated constructor */ public NodeAuthenticationToken(NodeAuthenticationToken sat, - GrantedAuthority[] authorities) { + Collection authorities) { super(sat.getPrincipal(), sat.getCredentials(), authorities); this.url = sat.getUrl(); } diff --git a/org.argeo.security.core/src/org/argeo/security/OsAuthenticationToken.java b/org.argeo.security.core/src/org/argeo/security/OsAuthenticationToken.java index b3727b26f..03d33f6cf 100644 --- a/org.argeo.security.core/src/org/argeo/security/OsAuthenticationToken.java +++ b/org.argeo.security.core/src/org/argeo/security/OsAuthenticationToken.java @@ -18,7 +18,7 @@ package org.argeo.security; import java.security.AccessController; import java.security.Principal; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Set; @@ -26,10 +26,10 @@ import javax.security.auth.Subject; import org.argeo.ArgeoException; import org.argeo.OperatingSystem; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; /** Abstracts principals provided by com.sun.security.auth.module login modules. */ public class OsAuthenticationToken implements Authentication { @@ -44,9 +44,9 @@ public class OsAuthenticationToken implements Authentication { private UserDetails details; /** Request */ - public OsAuthenticationToken(GrantedAuthority[] grantedAuthorities) { - this.grantedAuthorities = grantedAuthorities != null ? Arrays - .asList(grantedAuthorities) : null; + public OsAuthenticationToken( + Collection authorities) { + this.grantedAuthorities = new ArrayList(authorities); ClassLoader cl = getClass().getClassLoader(); switch (OperatingSystem.os) { case OperatingSystem.WINDOWS: @@ -98,15 +98,15 @@ public class OsAuthenticationToken implements Authentication { * Should not be called during authentication since group IDs are not yet * available {@link Subject} has been set */ - public GrantedAuthority[] getAuthorities() { + public Collection getAuthorities() { // grantedAuthorities should not be null at this stage List gas = new ArrayList( grantedAuthorities); for (Principal groupPrincipal : getGroupsIds()) { - gas.add(new GrantedAuthorityImpl("OSGROUP_" + gas.add(new SimpleGrantedAuthority("OSGROUP_" + groupPrincipal.getName())); } - return gas.toArray(new GrantedAuthority[gas.size()]); + return gas; } public UserDetails getDetails() { diff --git a/org.argeo.security.core/src/org/argeo/security/SecurityUtils.java b/org.argeo.security.core/src/org/argeo/security/SecurityUtils.java index e5b8ae79c..44ddeac86 100644 --- a/org.argeo.security.core/src/org/argeo/security/SecurityUtils.java +++ b/org.argeo.security.core/src/org/argeo/security/SecurityUtils.java @@ -16,14 +16,15 @@ package org.argeo.security; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.context.SecurityContext; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; /** Static utilities */ public class SecurityUtils { @@ -89,7 +90,7 @@ public class SecurityUtils { * read-only list of strings, for portability and integration */ public static List authoritiesToStringList( - GrantedAuthority[] authorities) { + Collection authorities) { List lst = new ArrayList(); for (GrantedAuthority ga : authorities) lst.add(ga.getAuthority()); diff --git a/org.argeo.security.core/src/org/argeo/security/UserAdminService.java b/org.argeo.security.core/src/org/argeo/security/UserAdminService.java index 0a84cf66f..8a391ff9f 100644 --- a/org.argeo.security.core/src/org/argeo/security/UserAdminService.java +++ b/org.argeo.security.core/src/org/argeo/security/UserAdminService.java @@ -17,7 +17,7 @@ package org.argeo.security; import java.util.Set; -import org.springframework.security.userdetails.UserDetailsManager; +import org.springframework.security.provisioning.UserDetailsManager; /** Enrich {@link UserDetailsManager} in order to provide roles semantics. */ public interface UserAdminService extends UserDetailsManager { diff --git a/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java index b84f3de00..3abc1b482 100644 --- a/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java +++ b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java @@ -19,10 +19,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.security.SystemAuthentication; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationManager; -import org.springframework.security.context.SecurityContext; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; /** Provides base method for executing code with system authorization. */ public abstract class AbstractSystemExecution { diff --git a/org.argeo.security.core/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java b/org.argeo.security.core/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java index 97dd6cae0..1c1059199 100644 --- a/org.argeo.security.core/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java +++ b/org.argeo.security.core/src/org/argeo/security/core/AuthenticatedApplicationContextInitialization.java @@ -32,7 +32,7 @@ import org.springframework.context.event.ContextRefreshedEvent; */ public class AuthenticatedApplicationContextInitialization extends AbstractSystemExecution implements InstantiationAwareBeanPostProcessor, - ApplicationListener { + ApplicationListener { // private Log log = LogFactory // .getLog(AuthenticatedApplicationContextInitialization.class); /** If non empty, restricts to these beans */ diff --git a/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java b/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java index 267ddd312..ee5e145ba 100644 --- a/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java +++ b/org.argeo.security.core/src/org/argeo/security/core/InternalAuthentication.java @@ -15,13 +15,14 @@ */ package org.argeo.security.core; +import java.util.Collections; + import org.argeo.security.SystemAuthentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.adapters.PrincipalSpringSecurityUserToken; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.authority.SimpleGrantedAuthority; /** A token base on a system key used to request a system authentication. */ -public class InternalAuthentication extends PrincipalSpringSecurityUserToken +public class InternalAuthentication extends UsernamePasswordAuthenticationToken implements SystemAuthentication { private static final long serialVersionUID = -6783376375615949315L; /** 'admin' for consistency with JCR */ @@ -32,12 +33,8 @@ public class InternalAuthentication extends PrincipalSpringSecurityUserToken public InternalAuthentication(String key, String systemUsername, String systemRole) { - super( - key, - systemUsername, - key, - new GrantedAuthority[] { new GrantedAuthorityImpl(systemRole) }, - systemUsername); + super(systemUsername, key, Collections + .singleton(new SimpleGrantedAuthority(systemRole))); } public InternalAuthentication(String key) { diff --git a/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java index 0471151a2..8fa3f0d6d 100644 --- a/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java +++ b/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java @@ -21,14 +21,14 @@ import java.util.List; import java.util.Properties; import org.springframework.core.io.Resource; -import org.springframework.security.AuthenticationException; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.AbstractUserDetailsAuthenticationProvider; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; /** @deprecated */ @Deprecated @@ -72,15 +72,8 @@ public class MatchingAuthenticationProvider extends List grantedAuthorities = new ArrayList(); for (String role : defaultRoles) grantedAuthorities.add(new GrantedAuthorityImpl(role)); - return new User( - username, - value, - true, - true, - true, - true, - grantedAuthorities - .toArray(new GrantedAuthority[grantedAuthorities.size()])); + return new User(username, value, true, true, true, true, + grantedAuthorities); } public void setMapping(Resource mapping) { diff --git a/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java index 0e29ecd59..4f1d56447 100644 --- a/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java +++ b/org.argeo.security.core/src/org/argeo/security/core/OsAuthenticationProvider.java @@ -16,14 +16,15 @@ package org.argeo.security.core; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.argeo.security.OsAuthenticationToken; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.providers.AuthenticationProvider; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; /** * Validates an OS authentication. The id is that it will always be @@ -44,13 +45,13 @@ public class OsAuthenticationProvider implements AuthenticationProvider { return new OsAuthenticationToken(getBaseAuthorities()); } - public static GrantedAuthority[] getBaseAuthorities() { + public static Collection getBaseAuthorities() { List auths = new ArrayList(); - auths.add(new GrantedAuthorityImpl(osUserRole)); - auths.add(new GrantedAuthorityImpl(userRole)); + auths.add(new SimpleGrantedAuthority(osUserRole)); + auths.add(new SimpleGrantedAuthority(userRole)); if (isAdmin) - auths.add(new GrantedAuthorityImpl(adminRole)); - return auths.toArray(new GrantedAuthority[auths.size()]); + auths.add(new SimpleGrantedAuthority(adminRole)); + return auths; } @SuppressWarnings("rawtypes") diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java b/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java index 2f7b97b78..208f85261 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java @@ -16,6 +16,7 @@ package org.argeo.security.jcr; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import javax.jcr.Node; @@ -25,12 +26,12 @@ import javax.jcr.Session; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.UserJcrUtils; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.DisabledException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.LockedException; -import org.springframework.security.userdetails.User; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.DisabledException; +import org.springframework.security.authentication.LockedException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; /** User details based on a user profile node. */ public class JcrUserDetails extends User implements ArgeoNames { @@ -44,7 +45,8 @@ public class JcrUserDetails extends User implements ArgeoNames { protected JcrUserDetails(String securityWorkspace, String homePath, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, - boolean accountNonLocked, GrantedAuthority[] authorities) + boolean accountNonLocked, + Collection authorities) throws IllegalArgumentException { super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); @@ -53,7 +55,8 @@ public class JcrUserDetails extends User implements ArgeoNames { } public JcrUserDetails(Node userProfile, String password, - GrantedAuthority[] authorities) throws RepositoryException { + Collection authorities) + throws RepositoryException { super( userProfile.getProperty(ARGEO_USER_ID).getString(), password, @@ -89,7 +92,8 @@ public class JcrUserDetails extends User implements ArgeoNames { * the granted authorities */ public JcrUserDetails(Session session, String username, String password, - GrantedAuthority[] authorities) throws RepositoryException { + Collection authorities) + throws RepositoryException { this(UserJcrUtils.getUserProfile(session, username), password != null ? password : "", authorities); } @@ -114,12 +118,11 @@ public class JcrUserDetails extends User implements ArgeoNames { public JcrUserDetails cloneWithNewRoles(List roles) { List authorities = new ArrayList(); for (String role : roles) { - authorities.add(new GrantedAuthorityImpl(role)); + authorities.add(new SimpleGrantedAuthority(role)); } return new JcrUserDetails(securityWorkspace, homePath, getUsername(), getPassword(), isEnabled(), isAccountNonExpired(), - isAccountNonExpired(), isAccountNonLocked(), - authorities.toArray(new GrantedAuthority[authorities.size()])); + isAccountNonExpired(), isAccountNonLocked(), authorities); } /** Clone immutable with new password */ diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrAuthenticationProvider.java index aa95e322d..7125604c7 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrAuthenticationProvider.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrAuthenticationProvider.java @@ -15,6 +15,8 @@ */ package org.argeo.security.jcr; +import java.util.Collection; + import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -25,12 +27,12 @@ import org.argeo.jcr.JcrUtils; import org.argeo.security.OsAuthenticationToken; import org.argeo.security.SecurityUtils; import org.argeo.security.core.OsAuthenticationProvider; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; /** Relies on OS to authenticate and additionally setup JCR */ public class OsJcrAuthenticationProvider extends OsAuthenticationProvider { @@ -76,7 +78,7 @@ public class OsJcrAuthenticationProvider extends OsAuthenticationProvider { try { // WARNING: at this stage we assume that the java properties // will have the same value - GrantedAuthority[] authorities = getBaseAuthorities(); + Collection authorities = getBaseAuthorities(); String username = JVM_OSUSER; Node userProfile = jcrSecurityModel.sync(nodeSession, username, SecurityUtils.authoritiesToStringList(authorities)); diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrUserAdminService.java b/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrUserAdminService.java index c25bdb865..1eab37048 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrUserAdminService.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/OsJcrUserAdminService.java @@ -30,9 +30,9 @@ import org.argeo.jcr.JcrUtils; import org.argeo.jcr.UserJcrUtils; import org.argeo.security.UserAdminService; import org.springframework.dao.DataAccessException; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** * Dummy user service to be used when running as a single OS user (typically diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java index 87208b2a3..154107576 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrAuthenticationProvider.java @@ -34,12 +34,12 @@ import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.UserJcrUtils; import org.argeo.security.NodeAuthenticationToken; import org.osgi.framework.BundleContext; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.providers.AuthenticationProvider; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; /** Connects to a JCR repository and delegates authentication to it. */ public class RemoteJcrAuthenticationProvider implements AuthenticationProvider, @@ -105,18 +105,18 @@ public class RemoteJcrAuthenticationProvider implements AuthenticationProvider, Value[] roles = userProfile.getProperty( ArgeoNames.ARGEO_REMOTE_ROLES).getValues(); for (int i = 0; i < roles.length; i++) - authoritiesList.add(new GrantedAuthorityImpl(roles[i] + authoritiesList.add(new SimpleGrantedAuthority(roles[i] .getString())); } - authoritiesList.add(new GrantedAuthorityImpl(ROLE_REMOTE)); + authoritiesList.add(new SimpleGrantedAuthority(ROLE_REMOTE)); // create authenticated objects - GrantedAuthority[] authorities = authoritiesList - .toArray(new GrantedAuthority[authoritiesList.size()]); + // GrantedAuthority[] authorities = authoritiesList + // .toArray(new GrantedAuthority[authoritiesList.size()]); JcrUserDetails userDetails = new JcrUserDetails(userProfile, - siteAuth.getCredentials().toString(), authorities); + siteAuth.getCredentials().toString(), authoritiesList); NodeAuthenticationToken authenticated = new NodeAuthenticationToken( - siteAuth, authorities); + siteAuth, authoritiesList); authenticated.setDetails(userDetails); return authenticated; } catch (RepositoryException e) { diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java b/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java index f0ad3a3a9..54406c0cb 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/RemoteJcrRepositoryWrapper.java @@ -31,9 +31,9 @@ import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.JcrRepositoryWrapper; import org.argeo.security.NodeAuthenticationToken; import org.argeo.security.SystemAuthentication; -import org.springframework.security.Authentication; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; /** * Wrapper around a remote Jackrabbit repository which allows to simplify diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/SecureThreadBoundSession.java b/org.argeo.security.core/src/org/argeo/security/jcr/SecureThreadBoundSession.java index b39877420..7ef15947f 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/SecureThreadBoundSession.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/SecureThreadBoundSession.java @@ -20,8 +20,8 @@ import javax.jcr.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.jcr.spring.ThreadBoundSession; -import org.springframework.security.Authentication; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; /** * Thread bounded JCR session factory which checks authentication and is diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java b/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java index 37dc98676..a573b6ae2 100644 --- a/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java +++ b/org.argeo.security.core/src/org/argeo/security/jcr/rememberme/JcrPersistentTokenRepository.java @@ -17,8 +17,8 @@ package org.argeo.security.jcr.rememberme; import java.util.Date; -import org.springframework.security.ui.rememberme.PersistentRememberMeToken; -import org.springframework.security.ui.rememberme.PersistentTokenRepository; +import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken; +import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; public class JcrPersistentTokenRepository implements PersistentTokenRepository { diff --git a/org.argeo.security.jackrabbit/bnd.bnd b/org.argeo.security.jackrabbit/bnd.bnd index 6cd12f83d..b8cdc7217 100644 --- a/org.argeo.security.jackrabbit/bnd.bnd +++ b/org.argeo.security.jackrabbit/bnd.bnd @@ -1,4 +1,4 @@ -Fragment-Host: org.apache.jackrabbit +Fragment-Host: org.apache.jackrabbit.core Import-Package: org.springframework.core,\ org.argeo.jcr,\ * diff --git a/org.argeo.security.jackrabbit/pom.xml b/org.argeo.security.jackrabbit/pom.xml index d615194b8..024dd0edd 100644 --- a/org.argeo.security.jackrabbit/pom.xml +++ b/org.argeo.security.jackrabbit/pom.xml @@ -16,17 +16,17 @@ org.argeo.security.core 2.1.12-SNAPSHOT - - org.argeo.tp - javax.jcr - - - org.argeo.tp - org.apache.jackrabbit - - - org.argeo.tp - org.springframework.security.core - + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoLoginModule.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoLoginModule.java index 43c544083..a80f26682 100644 --- a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoLoginModule.java +++ b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoLoginModule.java @@ -33,9 +33,9 @@ import org.apache.jackrabbit.core.security.authentication.AbstractLoginModule; import org.apache.jackrabbit.core.security.authentication.Authentication; import org.apache.jackrabbit.core.security.principal.AdminPrincipal; import org.argeo.security.SystemAuthentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; /** Jackrabbit login mechanism based on Spring Security */ public class ArgeoLoginModule extends AbstractLoginModule { @@ -46,7 +46,7 @@ public class ArgeoLoginModule extends AbstractLoginModule { public boolean login() throws LoginException { boolean loginOk = super.login(); if (!loginOk) { - org.springframework.security.Authentication authen = (org.springframework.security.Authentication) SecurityContextHolder + org.springframework.security.core.Authentication authen = (org.springframework.security.core.Authentication) SecurityContextHolder .getContext().getAuthentication(); } return loginOk; @@ -57,7 +57,7 @@ public class ArgeoLoginModule extends AbstractLoginModule { public boolean commit() throws LoginException { boolean commitOk = super.commit(); if (!commitOk) { - org.springframework.security.Authentication authen = (org.springframework.security.Authentication) SecurityContextHolder + org.springframework.security.core.Authentication authen = (org.springframework.security.core.Authentication) SecurityContextHolder .getContext().getAuthentication(); } return commitOk; @@ -69,7 +69,7 @@ public class ArgeoLoginModule extends AbstractLoginModule { */ @Override protected Principal getPrincipal(Credentials credentials) { - org.springframework.security.Authentication authen = SecurityContextHolder + org.springframework.security.core.Authentication authen = SecurityContextHolder .getContext().getAuthentication(); return authen; } @@ -86,7 +86,7 @@ public class ArgeoLoginModule extends AbstractLoginModule { protected Set syncPrincipals() { // use linked HashSet instead of HashSet in order to maintain the order // of principals (as in the Subject). - org.springframework.security.Authentication authen = (org.springframework.security.Authentication) principal; + org.springframework.security.core.Authentication authen = (org.springframework.security.core.Authentication) principal; Set principals = new LinkedHashSet(); principals.add(authen); @@ -164,12 +164,12 @@ public class ArgeoLoginModule extends AbstractLoginModule { } return new Authentication() { public boolean canHandle(Credentials credentials) { - return principal instanceof org.springframework.security.Authentication; + return principal instanceof org.springframework.security.core.Authentication; } public boolean authenticate(Credentials credentials) throws RepositoryException { - return ((org.springframework.security.Authentication) principal) + return ((org.springframework.security.core.Authentication) principal) .isAuthenticated(); } }; diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java index 3450c75d8..e785d887e 100644 --- a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java +++ b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java @@ -17,6 +17,7 @@ package org.argeo.security.jackrabbit; import java.security.Principal; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -39,9 +40,9 @@ import org.apache.jackrabbit.core.security.AccessManager; import org.apache.jackrabbit.core.security.AnonymousPrincipal; import org.apache.jackrabbit.core.security.SecurityConstants; import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; /** Integrates Spring Security and Jackrabbit Security users and roles. */ public class ArgeoSecurityManager extends DefaultSecurityManager { @@ -119,7 +120,8 @@ public class ArgeoSecurityManager extends DefaultSecurityManager { log.warn("User ID is '" + userId + "' but authen is " + authen.getName()); StringBuffer roles = new StringBuffer(""); - GrantedAuthority[] authorities = authen.getAuthorities(); + Collection authorities = authen + .getAuthorities(); for (GrantedAuthority ga : authorities) { roles.append(ga.toString()); } diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java index 482214e50..1263e68d8 100644 --- a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java +++ b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/GrantedAuthorityPrincipal.java @@ -17,7 +17,7 @@ package org.argeo.security.jackrabbit; import java.security.Principal; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.core.GrantedAuthority; /** Wraps a {@link GrantedAuthority} as a principal. */ class GrantedAuthorityPrincipal implements Principal { diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/JackrabbitUserAdminService.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/JackrabbitUserAdminService.java index 935581d7a..97cb538b4 100644 --- a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/JackrabbitUserAdminService.java +++ b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/JackrabbitUserAdminService.java @@ -25,16 +25,16 @@ import org.argeo.security.UserAdminService; import org.argeo.security.jcr.JcrSecurityModel; import org.argeo.security.jcr.JcrUserDetails; import org.springframework.dao.DataAccessException; -import org.springframework.security.Authentication; -import org.springframework.security.AuthenticationException; -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.AuthenticationProvider; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.UsernameNotFoundException; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** * An implementation of {@link UserAdminService} which closely wraps Jackrabbits @@ -279,20 +279,19 @@ public class JackrabbitUserAdminService implements UserAdminService, User user = (User) getUserManager().getAuthorizable(username); ArrayList authorities = new ArrayList(); // FIXME make it more generic - authorities.add(new GrantedAuthorityImpl("ROLE_USER")); + authorities.add(new SimpleGrantedAuthority("ROLE_USER")); Iterator groups = user.declaredMemberOf(); while (groups.hasNext()) { Group group = groups.next(); // String role = "ROLE_" // + group.getPrincipal().getName().toUpperCase(); String role = group.getPrincipal().getName(); - authorities.add(new GrantedAuthorityImpl(role)); + authorities.add(new SimpleGrantedAuthority(role)); } Node userProfile = UserJcrUtils.getUserProfile(session, username); JcrUserDetails userDetails = new JcrUserDetails(userProfile, - credentials.toString(), - authorities.toArray(new GrantedAuthority[authorities.size()])); + credentials.toString(), authorities); return userDetails; } diff --git a/org.argeo.security.ldap/bnd.bnd b/org.argeo.security.ldap/bnd.bnd index 12f35fa05..54b9824c1 100644 --- a/org.argeo.security.ldap/bnd.bnd +++ b/org.argeo.security.ldap/bnd.bnd @@ -1,4 +1,5 @@ Import-Package: org.springframework.core,\ +org.springframework,\ org.springframework.dao,\ javax.jcr.nodetype,\ * \ No newline at end of file diff --git a/org.argeo.security.ldap/pom.xml b/org.argeo.security.ldap/pom.xml index 5b798b411..e86cbff60 100644 --- a/org.argeo.security.ldap/pom.xml +++ b/org.argeo.security.ldap/pom.xml @@ -55,22 +55,22 @@ - - org.argeo.tp - javax.jcr - + + + + - - org.argeo.tp - org.springframework.ldap - + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + \ No newline at end of file diff --git a/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java index ea22ef350..a2c43a589 100644 --- a/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java +++ b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapShaPasswordEncoder.java @@ -15,7 +15,7 @@ */ package org.argeo.security.ldap; -import org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder; +import org.springframework.security.authentication.encoding.LdapShaPasswordEncoder; /** * {@link LdapShaPasswordEncoder} allowing to configure the usage of salt (APache diff --git a/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java index 0c7368f1f..89b5aa92d 100644 --- a/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java +++ b/org.argeo.security.ldap/src/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java @@ -28,12 +28,12 @@ import java.util.TreeSet; import org.argeo.ArgeoException; import org.argeo.security.UserAdminService; import org.springframework.ldap.core.ContextSource; -import org.springframework.security.Authentication; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.context.SecurityContextHolder; -import org.springframework.security.providers.encoding.PasswordEncoder; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.ldap.LdapUserDetailsManager; +import org.springframework.security.authentication.encoding.PasswordEncoder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.ldap.userdetails.LdapUserDetailsManager; /** Extends {@link LdapUserDetailsManager} by adding password encoding support. */ public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager diff --git a/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java index 3e9e2cbfa..e0519c37c 100644 --- a/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java +++ b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java @@ -17,13 +17,14 @@ package org.argeo.security.ldap.jcr; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; import java.util.SortedSet; -import java.util.UUID; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -52,11 +53,11 @@ import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.LdapTemplate; -import org.springframework.security.GrantedAuthority; +import org.springframework.security.authentication.encoding.PasswordEncoder; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.ldap.LdapUsernameToDnMapper; -import org.springframework.security.providers.encoding.PasswordEncoder; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.ldap.UserDetailsContextMapper; +import org.springframework.security.ldap.userdetails.UserDetailsContextMapper; /** Makes sure that LDAP and JCR are in line. */ public class JcrLdapSynchronizer implements UserDetailsContextMapper, @@ -210,7 +211,7 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper, .getProperty(ARGEO_USER_ID).getString(); // GrantedAuthority[] authorities = {new // GrantedAuthorityImpl(defaultUserRole)}; - GrantedAuthority[] authorities = {}; + List authorities = new ArrayList(); JcrUserDetails userDetails = new JcrUserDetails( userProfile, username, authorities); String dn = createLdapUser(userDetails); @@ -260,7 +261,8 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper, /** Called during authentication in order to retrieve user details */ public UserDetails mapUserFromContext(final DirContextOperations ctx, - final String username, GrantedAuthority[] authorities) { + final String username, + Collection authorities) { if (ctx == null) throw new ArgeoException("No LDAP information for user " + username); @@ -278,7 +280,8 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper, .getAttributeSortedStringSet(passwordAttribute); String password; if (passwordAttributes == null || passwordAttributes.size() == 0) { - //throw new ArgeoException("No password found for user " + username); + // throw new ArgeoException("No password found for user " + + // username); password = "NULL"; } else { byte[] arr = (byte[]) passwordAttributes.first(); diff --git a/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java index 87973d9bd..f63250c31 100644 --- a/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java +++ b/org.argeo.security.ldap/src/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java @@ -15,6 +15,7 @@ */ package org.argeo.security.ldap.jcr; +import java.util.Collection; import java.util.UUID; import javax.jcr.Node; @@ -29,9 +30,9 @@ import org.argeo.jcr.UserJcrUtils; import org.argeo.security.jcr.JcrUserDetails; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DirContextOperations; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.userdetails.UserDetails; -import org.springframework.security.userdetails.ldap.UserDetailsContextMapper; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.ldap.userdetails.UserDetailsContextMapper; /** @deprecated Read only mapping from LDAP to user details */ @Deprecated @@ -58,7 +59,8 @@ public class JcrUserDetailsContextMapper implements UserDetailsContextMapper, /** Called during authentication in order to retrieve user details */ public UserDetails mapUserFromContext(final DirContextOperations ctx, - final String username, GrantedAuthority[] authorities) { + final String username, + Collection authorities) { if (ctx == null) throw new ArgeoException("No LDAP information for user " + username); Node userHome = UserJcrUtils.getUserHome(securitySession, username); diff --git a/org.argeo.security.mvc/pom.xml b/org.argeo.security.mvc/pom.xml index 4fe9ca336..26c2f9ea0 100644 --- a/org.argeo.security.mvc/pom.xml +++ b/org.argeo.security.mvc/pom.xml @@ -26,20 +26,20 @@ - - org.argeo.tp - org.springframework.web.servlet - - - org.argeo.tp - org.springframework.aop - + + + + + + + + - - org.argeo.tp - javax.servlet - + + + + \ No newline at end of file diff --git a/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java b/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java index fde9f3034..bf73e073b 100644 --- a/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java +++ b/org.argeo.security.mvc/src/org/argeo/security/mvc/ArgeoRememberMeServices.java @@ -19,7 +19,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.ui.rememberme.TokenBasedRememberMeServices; +import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; public class ArgeoRememberMeServices extends TokenBasedRememberMeServices { public final static String DEFAULT_COOKIE_NAME = "ARGEO_SECURITY"; diff --git a/org.argeo.server.jackrabbit/.settings/org.eclipse.jdt.core.prefs b/org.argeo.server.jackrabbit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..51880a3eb --- /dev/null +++ b/org.argeo.server.jackrabbit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,89 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning diff --git a/org.argeo.server.jackrabbit/build.properties b/org.argeo.server.jackrabbit/build.properties index d32561da6..93e080c53 100644 --- a/org.argeo.server.jackrabbit/build.properties +++ b/org.argeo.server.jackrabbit/build.properties @@ -1,9 +1,2 @@ -additional.bundles = slf4j.api,\ - slf4j.log4j,\ - org.apache.log4j,\ - org.apache.commons.collections,\ - edu.oswego.cs.dl.util.concurrent,\ - org.h2,\ - org.apache.lucene,\ - org.springframework.context source.. = src/ +additional.bundles = org.apache.jackrabbit.data diff --git a/org.argeo.server.jackrabbit/pom.xml b/org.argeo.server.jackrabbit/pom.xml index e2edf43b9..08974660f 100644 --- a/org.argeo.server.jackrabbit/pom.xml +++ b/org.argeo.server.jackrabbit/pom.xml @@ -23,41 +23,41 @@ - - org.argeo.commons - org.argeo.dep.jackrabbit - pom - 2.1.12-SNAPSHOT - + + + + + + - - org.argeo.tp.rap.platform - org.eclipse.osgi - provided - + + + + + - - org.argeo.tp - org.springframework.beans - - - org.argeo.tp - org.springframework.web.servlet - - - org.argeo.tp - org.springframework.security.core - + + + + + + + + + + + + - - org.argeo.commons - org.argeo.dep.log4j - 2.1.12-SNAPSHOT - pom - test - + + + + + + + \ No newline at end of file diff --git a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java b/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java index ffe6df9b1..931f69786 100644 --- a/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java +++ b/org.argeo.server.jackrabbit/src/org/argeo/jackrabbit/remote/ScopedSessionProvider.java @@ -31,8 +31,8 @@ import org.apache.jackrabbit.server.SessionProvider; import org.argeo.ArgeoException; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.JcrUtils; -import org.springframework.security.Authentication; -import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; /** * Session provider assuming a single workspace and a short life cycle, diff --git a/org.argeo.server.jcr.mvc/pom.xml b/org.argeo.server.jcr.mvc/pom.xml index 9bc4a42ec..dcaf43213 100644 --- a/org.argeo.server.jcr.mvc/pom.xml +++ b/org.argeo.server.jcr.mvc/pom.xml @@ -54,31 +54,31 @@ - - org.argeo.tp - org.springframework.context - - - org.argeo.tp - org.springframework.core - - - org.argeo.tp - org.springframework.beans - - - org.argeo.tp - org.springframework.web - - - org.argeo.tp - org.springframework.web.servlet - + + + + + + + + + + + + + + + + + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + \ No newline at end of file diff --git a/org.argeo.server.jcr/bnd.bnd b/org.argeo.server.jcr/bnd.bnd index 59070705d..2b0bd1b2c 100644 --- a/org.argeo.server.jcr/bnd.bnd +++ b/org.argeo.server.jcr/bnd.bnd @@ -1,197 +1,6 @@ -# BND instructions -#----------------------------------------------------------------------- -#Tue Nov 25 13:14:59 CET 2014 -pom.id=org.argeo.commons\:org.argeo.server.jcr\:jar\:2.1.12-SNAPSHOT -env.DESKTOP_SESSION=gnome -env.OLDPWD=/home/mbaudier/dev/src/commons -file.encoding.pkg=sun.io -java.home=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre -env.GDM_LANG=en_GB.utf8 -env.DISPLAY=\:0.0 -env.LS_COLORS=rs\=0\:di\=01;34\:ln\=01;36\:mh\=00\:pi\=40;33\:so\=01;35\:do\=01;35\:bd\=40;33;01\:cd\=40;33;01\:or\=40;31;01\:mi\=01;05;37;41\:su\=37;41\:sg\=30;43\:ca\=30;41\:tw\=30;42\:ow\=34;42\:st\=37;44\:ex\=01;32\:*.tar\=01;31\:*.tgz\=01;31\:*.arj\=01;31\:*.taz\=01;31\:*.lzh\=01;31\:*.lzma\=01;31\:*.tlz\=01;31\:*.txz\=01;31\:*.zip\=01;31\:*.z\=01;31\:*.Z\=01;31\:*.dz\=01;31\:*.gz\=01;31\:*.lz\=01;31\:*.xz\=01;31\:*.bz2\=01;31\:*.tbz\=01;31\:*.tbz2\=01;31\:*.bz\=01;31\:*.tz\=01;31\:*.deb\=01;31\:*.rpm\=01;31\:*.jar\=01;31\:*.rar\=01;31\:*.ace\=01;31\:*.zoo\=01;31\:*.cpio\=01;31\:*.7z\=01;31\:*.rz\=01;31\:*.jpg\=01;35\:*.jpeg\=01;35\:*.gif\=01;35\:*.bmp\=01;35\:*.pbm\=01;35\:*.pgm\=01;35\:*.ppm\=01;35\:*.tga\=01;35\:*.xbm\=01;35\:*.xpm\=01;35\:*.tif\=01;35\:*.tiff\=01;35\:*.png\=01;35\:*.svg\=01;35\:*.svgz\=01;35\:*.mng\=01;35\:*.pcx\=01;35\:*.mov\=01;35\:*.mpg\=01;35\:*.mpeg\=01;35\:*.m2v\=01;35\:*.mkv\=01;35\:*.ogm\=01;35\:*.mp4\=01;35\:*.m4v\=01;35\:*.mp4v\=01;35\:*.vob\=01;35\:*.qt\=01;35\:*.nuv\=01;35\:*.wmv\=01;35\:*.asf\=01;35\:*.rm\=01;35\:*.rmvb\=01;35\:*.flc\=01;35\:*.avi\=01;35\:*.fli\=01;35\:*.flv\=01;35\:*.gl\=01;35\:*.dl\=01;35\:*.xcf\=01;35\:*.xwd\=01;35\:*.yuv\=01;35\:*.cgm\=01;35\:*.emf\=01;35\:*.axv\=01;35\:*.anx\=01;35\:*.ogv\=01;35\:*.ogx\=01;35\:*.aac\=01;36\:*.au\=01;36\:*.flac\=01;36\:*.mid\=01;36\:*.midi\=01;36\:*.mka\=01;36\:*.mp3\=01;36\:*.mpc\=01;36\:*.ogg\=01;36\:*.ra\=01;36\:*.wav\=01;36\:*.axa\=01;36\:*.oga\=01;36\:*.spx\=01;36\:*.xspf\=01;36\: -pom.contributors= -project.build.developers= -classworlds.conf=/opt/apache-maven/bin/m2.conf -env.XDG_SESSION_COOKIE=9bf883dac7be1df0f982e1dd0000003a-1416578122.683229-877522490 -pom.pomFile=/home/mbaudier/dev/src/commons/org.argeo.server.jcr/pom.xml -java.endorsed.dirs=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/endorsed -project.build.groupId=org.argeo.commons -env.LOGNAME=mbaudier -env.USERNAME=mbaudier -project.build.scm=org.apache.maven.model.Scm@14f65802 -env.SESSION_MANAGER=local/unix\:@/tmp/.ICE-unix/17546,unix/unix\:/tmp/.ICE-unix/17546 -env.KDEDIRS=/usr -sun.os.patch.level=unknown -java.vendor.url=http\://java.oracle.com/ -pom.profiles= -env.G_BROKEN_FILENAMES=1 -maven-symbolicname=org.argeo.commons.org.argeo.server.jcr -java.version=1.7.0_71 -env.ORBIT_SOCKETDIR=/tmp/orbit-mbaudier -project.build.contributors= -version.argeo-commons=2.1.12-SNAPSHOT -java.vendor.url.bug=http\://bugreport.sun.com/bugreport/ -user.name=mbaudier -env.LANG=en_GB.utf8 -env.CVS_RSH=ssh -project.build.pomFile=/home/mbaudier/dev/src/commons/org.argeo.server.jcr/pom.xml -sun.io.unicode.encoding=UnicodeLittle -sun.jnu.encoding=UTF-8 -env.DBUS_SESSION_BUS_ADDRESS=unix\:abstract\=/tmp/dbus-OazDk3vN1t,guid\=230af52c9acfa834ca05b3b0000059f6 -java.runtime.name=OpenJDK Runtime Environment -project.build.outputdirectory=/home/mbaudier/dev/src/commons/org.argeo.server.jcr/target/classes -env.SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass -rpm.release=6 -project.version=2.1.12-SNAPSHOT -java.specification.name=Java Platform API Specification -user.timezone= -env.LESSOPEN=||/usr/bin/lesspipe.sh %s -pom.mailingLists= -path.separator=\: -project.contributors= -project.inceptionYear=2007 -pom.artifactId=org.argeo.server.jcr -env.MAVEN_CMD_LINE_ARGS=-o clean install -project.name=Commons Server JCR -env.XMODIFIERS=@im\=none -file.encoding=UTF-8 -env.HOME=/home/mbaudier -sun.java.command=org.codehaus.plexus.classworlds.launcher.Launcher -o clean install -env.GTK_RC_FILES=/etc/gtk/gtkrc\:/home/mbaudier/.gtkrc-1.2-gnome2 -project.id=org.argeo.commons\:org.argeo.server.jcr\:jar\:2.1.12-SNAPSHOT -env.HOSTNAME=mostar -Export-Package=org.argeo.jcr.* -Bundle-License=http\://www.apache.org/licenses/LICENSE-2.0.txt -java.io.tmpdir=/tmp -project.build.mailingLists= -env.GNOME_KEYRING_PID=17536 -user.language=en -Include-Resource=org/argeo/jcr/argeo.cnd\=src/main/resources/org/argeo/jcr/argeo.cnd -env.HISTCONTROL=ignoredups -line.separator=\n -project.build.directory=/home/mbaudier/dev/src/commons/org.argeo.server.jcr/target -env.HISTSIZE=1000 -java.vm.info=mixed mode -developmentCycle.argeo-commons.startDate=2012-12-19 -sun.desktop=gnome -java.vm.specification.name=Java Virtual Machine Specification -project.modelEncoding=UTF-8 -env.COLORTERM=gnome-terminal -project.build.id=org.argeo.commons\:org.argeo.server.jcr\:jar\:2.1.12-SNAPSHOT -project.build.licenses=org.apache.maven.model.License@390bf60e -version.rap.addons=0.5.0.argeo.20141029 -pom.modelVersion=4.0.0 -project.licenses=org.apache.maven.model.License@390bf60e -env.GDMSESSION=gnome -project.developers= -java.awt.printerjob=sun.print.PSPrinterJob --removeheaders=Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By -pom.version=2.1.12-SNAPSHOT -env.WINDOWID=73400323 -pom.scm=org.apache.maven.model.Scm@14f65802 --plugin=org.apache.felix.bundleplugin.BlueprintPlugin,aQute.lib.spring.SpringXMLType -project.mailingLists= -pom.packaging=jar -project.build.parent=org.argeo.commons\:argeo-commons\:pom\:2.1.12-SNAPSHOT -project.projectDirectory=/home/mbaudier/dev/src/commons/org.argeo.server.jcr -os.name=Linux -project.build.modelVersion=4.0.0 -java.specification.vendor=Oracle Corporation -env.TERM=xterm -java.vm.name=OpenJDK 64-Bit Server VM -env.QT_IM_MODULE=xim -java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib -project.build.build=org.apache.maven.model.Build@40472e64 -env.PATH=/usr/lib64/qt-3.3/bin\:/usr/local/bin\:/usr/bin\:/bin\:/usr/local/sbin\:/usr/sbin\:/sbin\:/home/mbaudier/bin -pom.build=org.apache.maven.model.Build@40472e64 -java.class.version=51.0 -env.SHLVL=2 -project.build.version=2.1.12-SNAPSHOT -env.GNOME_KEYRING_SOCKET=/tmp/keyring-YLbPHE/socket -pom.parent=org.argeo.commons\:argeo-commons\:pom\:2.1.12-SNAPSHOT -pom.projectDirectory=/home/mbaudier/dev/src/commons/org.argeo.server.jcr -project.modelVersion=4.0.0 -rpm.stagingRepository=/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64 -Bundle-SymbolicName=org.argeo.server.jcr -sun.boot.library.path=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/amd64 -project.build.sourceEncoding=UTF-8 -Private-Package=org.argeo.jcr;org.argeo.jcr.proxy;org.argeo.jcr.security;org.argeo.jcr.spring;org.argeo.jcr.tabular;org.argeo.jcr.unit;-split-package\:\=merge-first -project.build.artifactId=org.argeo.server.jcr -sun.management.compiler=HotSpot 64-Bit Tiered Compilers -java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment -pom.name=Commons Server JCR -env.USER=mbaudier -pom.developers= -project.build=org.apache.maven.model.Build@40472e64 -project.scm=org.apache.maven.model.Scm@14f65802 -project.baseDir=/home/mbaudier/dev/src/commons/org.argeo.server.jcr -project.build.name=Commons Server JCR -java.vm.specification.version=1.7 -env.KDE_IS_PRELINKED=1 -project.build.inceptionYear=2007 -env.GDM_KEYBOARD_LAYOUT=de -project.groupId=org.argeo.commons -Bundle-Version=2.1.12-SNAPSHOT-r${tstamp} -env.NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat -awt.toolkit=sun.awt.X11.XToolkit -project.build.profiles= -sun.cpu.isalist= -developmentCycle.argeo-commons=2.1 -project.profiles= -java.ext.dirs=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/ext\:/usr/java/packages/lib/ext -Import-Package=junit.framework;resolution\:\=optional,org.xml.sax;version\="0.0.0",org.springframework.core;resolution\:\=optional,org.springframework.core.io;resolution\:\=optional,org.springframework.*;resolution\:\=optional,* -os.version=2.6.32-504.1.3.el6.x86_64 -user.home=/home/mbaudier -java.vm.vendor=Oracle Corporation -env.JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64 -SLC-Category=org.argeo.commons -env.XAUTHORITY=/var/run/gdm/auth-for-mbaudier-7t5RHJ/database -user.dir=/home/mbaudier/dev/src/commons -env.XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt -env.WINDOWPATH=1 -env.MAIL=/var/spool/mail/mbaudier -project.build.modelEncoding=UTF-8 -env.PWD=/home/mbaudier/dev/src/commons -project.parent=org.argeo.commons\:argeo-commons\:pom\:2.1.12-SNAPSHOT -sun.cpu.endian=little -env.QTLIB=/usr/lib64/qt-3.3/lib -pom.licenses=org.apache.maven.model.License@390bf60e -project.dir=/home/mbaudier/dev/src/commons/org.argeo.server.jcr -classifier= -version.argeo-distribution=1.4.0 -java.vm.version=24.65-b04 -java.class.path=/opt/apache-maven/boot/plexus-classworlds-2.5.1.jar -env.QTDIR=/usr/lib64/qt-3.3 -os.arch=amd64 -maven.build.version=Apache Maven 3.2.3 (33f8c3e1027c3ddde99d3cdebad2656a31e8fdf4; 2014-08-11T22\:58\:10+02\:00) -project.build.projectDirectory=/home/mbaudier/dev/src/commons/org.argeo.server.jcr -version.rap=2.2.0-R-20131204-0942 -sun.java.launcher=SUN_STANDARD -pom.inceptionYear=2007 -env.IMSETTINGS_INTEGRATE_DESKTOP=yes -project.packaging=jar -java.vm.specification.vendor=Oracle Corporation -file.separator=/ -java.runtime.version=1.7.0_71-mockbuild_2014_10_17_22_23-b00 -project.pomFile=/home/mbaudier/dev/src/commons/org.argeo.server.jcr/pom.xml -env.SSH_AUTH_SOCK=/tmp/keyring-YLbPHE/socket.ssh -sun.boot.class.path=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/resources.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/rt.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/sunrsasign.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/jsse.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/jce.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/charsets.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/rhino.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/lib/jfr.jar\:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.71.x86_64/jre/classes -project.build.packaging=jar -maven.version=3.2.3 -project.artifactId=org.argeo.server.jcr -env.QTINC=/usr/lib64/qt-3.3/include -user.country=GB -pom.modelEncoding=UTF-8 -maven.home=/opt/apache-maven -env.SHELL=/bin/bash -Bundle-RequiredExecutionEnvironment=JavaSE-1.6 --sourcepath=/home/mbaudier/dev/src/commons/org.argeo.server.jcr/src/main/java,/home/mbaudier/dev/src/commons/org.argeo.server.jcr/target/classes -pom.groupId=org.argeo.commons -java.vendor=Oracle Corporation -env.GPG_AGENT_INFO=/tmp/seahorse-CQZHIM/S.gpg-agent\:17621\:1; -env.IMSETTINGS_MODULE=none -Bundle-Name=Commons Server JCR -java.specification.version=1.7 -env.GNOME_DESKTOP_SESSION_ID=this-is-deprecated -sun.arch.data.model=64 -#----------------------------------------------------------------------- +Import-Package: junit.framework;resolution:=optional,\ +org.xml.sax;version="0.0.0",\ +org.springframework.core;resolution:=optional,\ +org.springframework.core.io;resolution:=optional,\ +org.springframework.*;resolution:=optional,\ +* diff --git a/org.argeo.server.jcr/build.properties b/org.argeo.server.jcr/build.properties index d564e5792..aa28342fd 100644 --- a/org.argeo.server.jcr/build.properties +++ b/org.argeo.server.jcr/build.properties @@ -6,17 +6,12 @@ output.. = target/classes/,\ target/test-classes/ bin.includes = META-INF/,\ . -additional.bundles = slf4j.api,\ - slf4j.log4j,\ - org.apache.log4j,\ - org.apache.commons.collections,\ - edu.oswego.cs.dl.util.concurrent,\ - org.apache.lucene,\ - junit,\ - org.apache.xml.serializer,\ - org.apache.commons.dbcp,\ - org.apache.commons.pool,\ - org.apache.jackrabbit,\ - org.h2,\ - org.apache.tika +additional.bundles = org.junit,\ + org.apache.jackrabbit.core,\ + javax.jcr,\ + org.apache.jackrabbit.api,\ + org.apache.jackrabbit.data,\ + org.apache.jackrabbit.jcr.commons,\ + org.apache.jackrabbit.spi,\ + org.apache.jackrabbit.spi.commons diff --git a/org.argeo.server.jcr/pom.xml b/org.argeo.server.jcr/pom.xml index 84d8d6aae..ed300bd96 100644 --- a/org.argeo.server.jcr/pom.xml +++ b/org.argeo.server.jcr/pom.xml @@ -10,35 +10,6 @@ Commons Server JCR - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - - - - org.argeo.jcr.* - - junit.framework;resolution:=optional, - org.xml.sax;version="0.0.0", - org.springframework.core;resolution:=optional, - org.springframework.core.io;resolution:=optional, - org.springframework.*;resolution:=optional, - * - - - org.argeo.maven.plugins maven-argeo-osgi-plugin @@ -63,68 +34,76 @@ 2.1.12-SNAPSHOT + + + + + + + + - - org.argeo.tp - javax.jcr - + + + + - - org.argeo.tp - org.apache.commons.io - + + + + - - org.argeo.tp - org.springframework.core - provided - - - org.argeo.tp - org.springframework.beans - provided - + + + + + + + + + + - - org.argeo.tp - org.eclipse.osgi - provided - + + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + - - org.argeo.tp - junit - true - - - org.argeo.commons - org.argeo.dep.jackrabbit - 2.1.12-SNAPSHOT - pom - test - - - org.argeo.commons - org.argeo.dep.log4j - 2.1.12-SNAPSHOT - pom - test - - - org.argeo.commons - org.argeo.osgi.boot - 2.1.12-SNAPSHOT - test - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.util/build.properties b/org.argeo.util/build.properties index e03532561..52f323cda 100644 --- a/org.argeo.util/build.properties +++ b/org.argeo.util/build.properties @@ -1,4 +1,4 @@ -additional.bundles = junit source.. = src/,\ ext/test/ output.. = bin/ +additional.bundles = org.junit diff --git a/org.argeo.util/pom.xml b/org.argeo.util/pom.xml index d1c52d195..b7da7f454 100644 --- a/org.argeo.util/pom.xml +++ b/org.argeo.util/pom.xml @@ -1,4 +1,6 @@ - + + 4.0.0 org.argeo.commons @@ -8,11 +10,20 @@ org.argeo.util Commons Util (no third party dependencies) - - - org.argeo.tp - junit - test - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a5b11d142..642c4801f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,8 @@ 2.1.12-SNAPSHOT 2.1 2012-12-19 - 1.4.0 + 2.1.2 + 3.8.2 2.2.0-R-20131204-0942 0.5.0.argeo.20141029 @@ -25,15 +26,11 @@ org.argeo.util org.argeo.osgi.boot org.argeo.server.jcr - - org.argeo.eclipse.ui - org.argeo.eclipse.ui.rap - org.argeo.eclipse.ui.rcp org.argeo.security.core org.argeo.security.jackrabbit org.argeo.security.ldap - org.argeo.security.mvc + org.argeo.security.auth.ldap org.argeo.security.dao.ldap @@ -43,27 +40,31 @@ org.argeo.server.jcr.mvc org.argeo.server.jackrabbit - org.argeo.jackrabbit.webapp - org.argeo.server.ads - org.argeo.server.ads.server - org.argeo.server.rap.webapp + + + + + + + + - 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 + + - org.argeo.server.core - org.argeo.ext.jdbm + + - dep - dist + + scm:svn:https://svn.argeo.org/commons/trunk @@ -153,8 +154,8 @@ limitations under the License. maven-compiler-plugin 3.2 - 1.6 - 1.6 + 1.7 + 1.7 eclipse target/classes @@ -250,7 +251,7 @@ limitations under the License. <_include>bnd.bnd ${project.version}-r${tstamp} ${project.artifactId} - JavaSE-1.6 + JavaSE-1.7 <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By ${project.groupId} @@ -422,43 +423,74 @@ limitations under the License. + + + org.argeo.tp + argeo-tp + ${version.argeo-distribution} + provided + + - - org.argeo.tp - binaries - ${version.argeo-distribution} - pom - import - + + + + + + + - - org.argeo.tp.rap - binaries - ${version.argeo-distribution} - pom - import - - - org.argeo.tp.rap.addons - binaries - ${version.rap.addons} - pom - import - - - org.argeo.tp.rap.platform - binaries - ${version.rap} - pom - import - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + argeo-tp - http://repo.argeo.org/data/public/java/argeo-tp-1.4 + http://localhost:7080/data/public/java/argeo-tp-2.1 + + true + daily + warn + + + + argeo-tp-eclipseIde + http://localhost:7080/data/public/java/eclipse-ide-3.8 true daily @@ -467,7 +499,7 @@ limitations under the License. argeo-tp-rap - http://repo.argeo.org/data/public/java/eclipse-rap-2.2 + http://localhost:7080/data/public/java/eclipse-rap-2.2 true daily @@ -506,4 +538,21 @@ limitations under the License. dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons} + + + localrepo + + + localrepo + Internal Release Repository + dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons} + + + site + Argeo Commons Site + dav:http://localhost:7080/data/files/docs/argeo-commons-${developmentCycle.argeo-commons} + + + +