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 d02bee48f5acdbae748f0c1e3283f8aedbfd5ab1..900ffba971764bf63e61f3b12370522ce24b948c 100644 (file)
--- 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 (file)
index 0000000..9a3cc74
--- /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"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+       http://www.springframework.org/schema/beans   \r
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
+               <beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />\r
+       </service>\r
+\r
+       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
+               <beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />\r
+       </service>\r
+\r
+</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 c1f697c723f0825236dcc23f0eb159cff7d8a057..f11855ca5c94035cfc4afb79d42f18389a4e3f96 100644 (file)
--- 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 80e86bd7b2887083c2f24e1c50563d9facf48cca..4cd0f21f1e5894178bdf03c6ee0ee1ea92695fe0 100644 (file)
--- 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 @@
 \r
        <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao"\r
                context-class-loader="service-provider" />\r
-\r
-       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
-               <beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />\r
-       </service>\r
-\r
-       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
-               <beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />\r
-       </service>\r
-\r
 </beans:beans>
\ No newline at end of file