From: Mathieu Baudier Date: Wed, 28 Apr 2010 09:38:08 +0000 (+0000) Subject: Adapt to new versions X-Git-Tag: argeo-commons-2.1.30~1626 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=485359039eae0048c0688f67f2878533a7a32e9c;p=lgpl%2Fargeo-commons.git Adapt to new versions git-svn-id: https://svn.argeo.org/commons/trunk@3509 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/security/runtime/org.argeo.security.core/build.properties b/security/runtime/org.argeo.security.core/build.properties index 2e1a6e7fb..05ab76771 100644 --- a/security/runtime/org.argeo.security.core/build.properties +++ b/security/runtime/org.argeo.security.core/build.properties @@ -5,7 +5,7 @@ additional.bundles = org.springframework.transaction,\ com.springsource.org.codehaus.jackson,\ com.springsource.json,\ com.springsource.org.apache.commons.codec,\ - org.springframework.security,\ + org.springframework.security.core,\ com.springsource.org.codehaus.jackson.mapper source.. = src/main/java/,\ src/main/resources/,\ diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml index 5ef816eec..03f27740f 100644 --- a/security/runtime/org.argeo.security.core/pom.xml +++ b/security/runtime/org.argeo.security.core/pom.xml @@ -49,11 +49,19 @@ - - org.argeo.dep.osgi + + + org.springframework.ldap + org.springframework.ldap + + + org.springframework + org.springframework.transaction - @@ -66,7 +74,7 @@ org.springframework.security - org.springframework.security + org.springframework.security.core diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoLdapAuthoritiesPopulator.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoLdapAuthoritiesPopulator.java deleted file mode 100644 index 9df6ed4a7..000000000 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoLdapAuthoritiesPopulator.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.argeo.security.ldap; - -import org.springframework.ldap.core.ContextSource; -import org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator; - -/** TODO: notify Spring Security to open this class more. */ -public class ArgeoLdapAuthoritiesPopulator extends - DefaultLdapAuthoritiesPopulator { - - /* Hacked from parent class */ - private String groupRoleAttribute = "cn"; - private final String groupSearchBase; - private String rolePrefix = "ROLE_"; - private boolean convertToUpperCase = true; - - public ArgeoLdapAuthoritiesPopulator(ContextSource contextSource, - String groupSearchBase) { - super(contextSource, groupSearchBase); - this.groupSearchBase = groupSearchBase; - } - - @Override - public void setConvertToUpperCase(boolean convertToUpperCase) { - super.setConvertToUpperCase(convertToUpperCase); - this.convertToUpperCase = convertToUpperCase; - } - - @Override - public void setGroupRoleAttribute(String groupRoleAttribute) { - super.setGroupRoleAttribute(groupRoleAttribute); - this.groupRoleAttribute = groupRoleAttribute; - } - - @Override - public void setRolePrefix(String rolePrefix) { - super.setRolePrefix(rolePrefix); - this.rolePrefix = rolePrefix; - } - - /** Hacked from parent class. */ - public String convertGroupToRole(String groupName) { - if (convertToUpperCase) { - groupName = groupName.toUpperCase(); - } - - return rolePrefix + groupName; - } - - public String getGroupRoleAttribute() { - return groupRoleAttribute; - } - - public String getGroupSearchBase() { - return groupSearchBase; - } - -} diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java deleted file mode 100644 index 016a7bae6..000000000 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.argeo.security.ldap; - -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.core.DistinguishedName; -import org.springframework.security.userdetails.ldap.LdapUserDetailsManager; - -public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager { - - public ArgeoLdapUserDetailsManager(ContextSource contextSource) { - super(contextSource); - } - - @Override - protected DistinguishedName buildGroupDn(String group) { - // TODO Auto-generated method stub - return super.buildGroupDn(group); - } - -} diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java index 15cd1360b..305fe903f 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java @@ -51,6 +51,7 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean private LdapUsernameToDnMapper usernameMapper = null; private UserDetailsContextMapper userDetailsMapper; +// private LdapUserDetailsService ldapUserDetailsService; private List userNatureMappers; public void afterPropertiesSet() throws Exception { @@ -82,6 +83,11 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean userDetailsManager = ludm; } +// if (ldapUserDetailsService == null) { +// ldapUserDetailsService = new LdapUserDetailsService(null, +// authoritiesPopulator); +// ldapUserDetailsService.setUserDetailsMapper(userDetailsMapper); +// } } public ArgeoSecurityDaoLdap(ContextSource contextSource) { diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml index 083070fb6..b5cec22ca 100644 --- a/server/dep/org.argeo.server.dep.tomcat/pom.xml +++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml @@ -96,20 +96,20 @@ org.argeo.dep.osgi.catalina.start - org.apache.coyote.springsource - com.springsource.org.apache.coyote.springsource + org.apache.coyote + com.springsource.org.apache.coyote - org.apache.catalina.springsource - com.springsource.org.apache.catalina.springsource + org.apache.catalina + com.springsource.org.apache.catalina - org.apache.jasper.springsource - com.springsource.org.apache.jasper.springsource + org.apache.jasper + com.springsource.org.apache.jasper - org.apache.el.springsource - com.springsource.org.apache.el.springsource + org.apache.el + com.springsource.org.apache.el \ No newline at end of file diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF index 6885d9f54..5daaf8ec7 100644 --- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Fragment-Host: com.springsource.org.apache.catalina.springsource;bundle-version="[6 +Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6 .0.16,7.0.0)" Bundle-Version: 0.1.3.SNAPSHOT Bundle-SymbolicName: org.argeo.server.catalina diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml index 58ff3063e..d0b857192 100644 --- a/server/runtime/org.argeo.server.jackrabbit/pom.xml +++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml @@ -92,7 +92,7 @@ org.springframework.security - org.springframework.security + org.springframework.security.core