From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 6 Jul 2010 16:19:13 +0000 (+0000)
Subject: Prepare the introduction of Spring 3
X-Git-Tag: argeo-commons-2.1.30~1596
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=a60b32ed0c559ff23e97daf7c96c34670757a7f5;p=lgpl%2Fargeo-commons.git

Prepare the introduction of Spring 3

git-svn-id: https://svn.argeo.org/commons/trunk@3647 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/pom.xml b/pom.xml
index 1783d704e..075593492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<packaging>pom</packaging>
 	<properties>
 		<developmentCycle>0.2</developmentCycle>
-		<version.argeo-distribution>1.0.4</version.argeo-distribution>
+		<version.argeo-distribution>1.1.0-SNAPSHOT</version.argeo-distribution>
 		<version.argeo-ria>0.12.4</version.argeo-ria>
 		<version.maven-argeo-osgi>0.1.28</version.maven-argeo-osgi>
 		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 99ca8adf0..a178bfe6e 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -59,8 +59,8 @@
 
 		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>org.springframework.ldap</artifactId>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
index a334a4710..236a3b858 100644
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
@@ -33,7 +33,6 @@ import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.io.Resource;
@@ -161,8 +160,7 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 			res.addAll((Collection<T>) model.get(classToUse).values());
 
 		if (applicationContext != null)
-			res.addAll(new GenericBeanFactoryAccessor(applicationContext)
-					.getBeansOfType(clss).values());
+			res.addAll(applicationContext.getBeansOfType(clss).values());
 
 		return res;
 	}