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 2e1a6e7fb9cedaa96d93e0dbb532066abc386e38..05ab7677181f0ac0680ecf0e18bd21a1afe35afc 100644 (file)
--- 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 5ef816eecd81e57f293aae880ec1863685ee22e1..03f27740fb7a024be2ee562b7e84a403c99131ac 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -49,11 +49,19 @@
                </dependency>
 
                <!-- Spring LDAP -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
+               <!--
+                       <dependency> <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
+                       </dependency>
+               -->
+               <dependency>
+                       <groupId>org.springframework.ldap</groupId>
+                       <artifactId>org.springframework.ldap</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.transaction</artifactId>
                </dependency>
-
 
                <!-- Security -->
                <dependency>
@@ -66,7 +74,7 @@
                </dependency>
                <dependency>
                        <groupId>org.springframework.security</groupId>
-                       <artifactId>org.springframework.security</artifactId>
+                       <artifactId>org.springframework.security.core</artifactId>
                </dependency>
 
                <!-- Logging -->

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 (file)
index 9df6ed4..0000000
--- 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 (file)
index 016a7ba..0000000
--- 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 15cd1360b915b1d80c54a7b70d25e28c2e73f75d..305fe903f9f9cf55f0a81c58ddf8a15f70f664e0 100644 (file)
--- 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<UserNatureMapper> 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 083070fb662c5cd9b6e5248efd7e1f04dd1acf3f..b5cec22cad047a074aa7e9ad453213d65fe0434b 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -96,20 +96,20 @@
                        <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.coyote.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.coyote.springsource</artifactId>
+                       <groupId>org.apache.coyote</groupId>
+                       <artifactId>com.springsource.org.apache.coyote</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.catalina.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.catalina.springsource</artifactId>
+                       <groupId>org.apache.catalina</groupId>
+                       <artifactId>com.springsource.org.apache.catalina</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.jasper.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.jasper.springsource</artifactId>
+                       <groupId>org.apache.jasper</groupId>
+                       <artifactId>com.springsource.org.apache.jasper</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.el.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.el.springsource</artifactId>
+                       <groupId>org.apache.el</groupId>
+                       <artifactId>com.springsource.org.apache.el</artifactId>
                </dependency>
        </dependencies>
 </project>
\ 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 6885d9f540631136d173d0f5a0548c6e41f5d9b5..5daaf8ec7a12df64904494e15d63b519d993dcb9 100644 (file)
--- 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 58ff3063e56abd3045469bd888c11bee29cea607..d0b857192c1e0249b66ec4e41d8138cfe955abdf 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -92,7 +92,7 @@
 
                <dependency>
                        <groupId>org.springframework.security</groupId>
-                       <artifactId>org.springframework.security</artifactId>
+                       <artifactId>org.springframework.security.core</artifactId>
                </dependency>
 
                <!-- Logging -->