Fix build issue

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

diff --git a/security/plugins/org.argeo.security.equinox/META-INF/spring/loginModules.xml b/security/plugins/org.argeo.security.equinox/META-INF/spring/loginModules.xml
index f409ecd995fd6d1741867a02cd954c0574bfd928..5714e0e19329f40bf9b01687c06f08fdc082f21d 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/META-INF/spring/loginModules.xml
+++ b/security/plugins/org.argeo.security.equinox/META-INF/spring/loginModules.xml
@@ -13,8 +13,4 @@
                scope="prototype">
                <property name="authenticationManager" ref="authenticationManager" />
        </bean>
-
-       <bean id="keyringLoginModule" class="org.argeo.crypto.KeyringLoginModule"
-               scope="prototype">
-       </bean>
 </beans>

diff --git a/security/plugins/org.argeo.security.equinox/plugin.xml b/security/plugins/org.argeo.security.equinox/plugin.xml
index 82da571f7f1023172fbbee7edd3feb118a0858e9..0bacbda67b808b2e8f3fc0e333c8c5ba7b9d2016 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/plugin.xml
+++ b/security/plugins/org.argeo.security.equinox/plugin.xml
@@ -10,10 +10,6 @@
   <loginModule class="org.argeo.eclipse.spring.SpringExtensionFactory" description="Argeo Spring OS Login Module"/>
   </extension>
   
-  <extension id="keyringLoginModule" name="Argeo Keyring" point="org.eclipse.equinox.security.loginModule">
-  <loginModule class="org.argeo.eclipse.spring.SpringExtensionFactory" description="Argeo Keyring Login Module"/>
-  </extension>
-  
   <!-- Java -->
   <extension id="unixLoginModule" name="UNIX" point="org.eclipse.equinox.security.loginModule">
   <loginModule class="com.sun.security.auth.module.UnixLoginModule" description="UNIX Login Module"/>

diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml
index 31cd1da14a5524125a06ded6ed42cdbf9212ce40..a830d6485ae741ba4fabd21a8fb99af6c4ae226b 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/pom.xml
+++ b/security/plugins/org.argeo.security.equinox/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.security</groupId>
@@ -28,23 +29,10 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
-<!--                                   <instructions>-->
-<!--                                           <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>-->
-<!--                                           <Bundle-Activator>org.argeo.security.equinox.EquinoxSecurity</Bundle-Activator>-->
-<!--                                           <Import-Package>-->
-<!--                                                   org.osgi.framework;version="0.0.0",-->
-<!--                                                   !org.eclipse.equinox.security.auth,-->
-<!--                                                   org.springframework.core,-->
-<!--                                                   org.argeo.eclipse.spring,-->
-<!--                                                   *-->
-<!--                                           </Import-Package>-->
-<!--                                           <Require-Bundle>org.eclipse.equinox.security</Require-Bundle>-->
-<!--                                   </instructions>-->
                                        <instructions>
                                                <Import-Package>*,
                                                        org.springframework.core,
-                                                       org.argeo.eclipse.spring,
-                                                       org.argeo.util.crypto
+                                                       org.argeo.eclipse.spring
                                                </Import-Package>
                                        </instructions>
                                </configuration>