From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 30 Sep 2011 07:07:08 +0000 (+0000)
Subject: Fix build issue
X-Git-Tag: argeo-commons-2.1.30~1132
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=0af42e4b2c70611bf815e279d1f9e470318be70f;hp=075769eae68827ff2b29538689964d1029523599;p=lgpl%2Fargeo-commons.git

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 f409ecd99..5714e0e19 100644
--- 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 82da571f7..0bacbda67 100644
--- 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 31cd1da14..a830d6485 100644
--- 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>