OSGi complete distribution

[gpl/argeo-tp.git] / META-INF / spring / spring.security.xml

diff --git a/META-INF/spring/spring.security.xml b/META-INF/spring/spring.security.xml
index c21f48d6c7cefe9523389830a6b07816f9c44a5a..cefb63b6ed19cc6eaaece4c2e4df4a23bb117c4b 100644 (file)
--- a/META-INF/spring/spring.security.xml
+++ b/META-INF/spring/spring.security.xml
@@ -14,8 +14,7 @@
                <property name="doNotModify" value="true" />
        </bean>
 
-       <flow:flow name="spring/org.springframework.security"
-               spec="spec.version">
+       <flow:flow name="spring/org.springframework.security" spec="spec.version">
                <flow:arg name="version" value="3.2.5.RELEASE" />
                <bean parent="template.archiveWrapper">
                        <property name="uri"
@@ -25,25 +24,36 @@
                        </property>
                        <property name="wrappers">
                                <map>
-                                       <entry key="spring-security-@{version}/dist/spring-security-acl-@{version}.jar">
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-acl-@{version}.jar">
                                                <bean id="org.springframework.security.acls" parent="template.spring.security" />
                                        </entry>
-                                       <entry key="spring-security-@{version}/dist/spring-security-config-@{version}.jar">
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-aspects-@{version}.jar">
+                                               <bean id="org.springframework.security.aspects" parent="template.spring.security" />
+                                       </entry>
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-config-@{version}.jar">
                                                <bean id="org.springframework.security.config" parent="template.spring.security" />
                                        </entry>
-                                       <entry key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
                                                <bean id="org.springframework.security" parent="template.spring.security" />
                                        </entry>
-                                       <entry key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
                                                <bean id="org.springframework.security.crypto" parent="template.spring.security" />
                                        </entry>
-                                       <entry key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
                                                <bean id="org.springframework.security.ldap" parent="template.spring.security" />
                                        </entry>
-                                       <entry key="spring-security-@{version}/dist/spring-security-openid-@{version}.jar">
-                                               <bean id="org.springframework.security.openid" parent="template.spring.security" />
-                                       </entry>
-                                       <entry key="spring-security-@{version}/dist/spring-security-web-@{version}.jar">
+                                       <!-- <entry key="spring-security-@{version}/dist/spring-security-openid-@{version}.jar"> -->
+                                       <!-- <bean id="org.springframework.security.openid" parent="template.spring.security" 
+                                               /> -->
+                                       <!-- </entry> -->
+                                       <entry
+                                               key="spring-security-@{version}/dist/spring-security-web-@{version}.jar">
                                                <bean id="org.springframework.security.web" parent="template.spring.security" />
                                        </entry>
                                </map>