From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Feb 2010 12:40:10 +0000 (+0000)
Subject: Move LDAP mappers location
X-Git-Tag: argeo-commons-2.1.30~1644
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4a045d66694bcb80968158dc82344f3906fce530;p=lgpl%2Fargeo-commons.git

Move LDAP mappers location

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

diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
index d02bee48f..900ffba97 100644
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: com.sun.jndi.ldap;resolution:=optional,
  org.argeo.security,
  org.argeo.security.ldap,
+ org.argeo.security.ldap.nature,
  org.springframework.beans.factory.config,
  org.springframework.ldap.core.support,
  org.springframework.security,
diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/natures-osgi.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/natures-osgi.xml
new file mode 100644
index 000000000..9a3cc743d
--- /dev/null
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/natures-osgi.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<service interface="org.argeo.security.ldap.UserNatureMapper">
+		<beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />
+	</service>
+
+	<service interface="org.argeo.security.ldap.UserNatureMapper">
+		<beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />
+	</service>
+
+</beans:beans>
\ No newline at end of file
diff --git a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
index c1f697c72..f11855ca5 100644
--- a/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
+++ b/security/modules/org.argeo.security.services/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-Version: 0.1.3.SNAPSHOT
 Import-Package: org.argeo.security,
  org.argeo.security.core,
  org.argeo.security.ldap,
- org.argeo.security.ldap.nature,
  org.argeo.security.nature,
  org.argeo.server.json
 Bundle-Name: Security Services
diff --git a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
index 80e86bd7b..4cd0f21f1 100644
--- a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
+++ b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
@@ -11,13 +11,4 @@
 
 	<reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao"
 		context-class-loader="service-provider" />
-
-	<service interface="org.argeo.security.ldap.UserNatureMapper">
-		<beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />
-	</service>
-
-	<service interface="org.argeo.security.ldap.UserNatureMapper">
-		<beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />
-	</service>
-
 </beans:beans>
\ No newline at end of file