From 22536588f06e6180c2e6dcce0b8cabaa2c2ce5fd Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 6 May 2010 06:15:06 +0000
Subject: [PATCH] Add ActiveMQ security support

git-svn-id: https://svn.argeo.org/commons/trunk@3554 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../runtime/org.argeo.security.core/pom.xml   | 31 ++++++++++---------
 .../SecuredActiveMqConnectionFactory.java     |  4 +++
 .../core/MatchingAuthenticationProvider.java  |  3 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 221bdfebd..29b4283e8 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -33,6 +33,7 @@
 							org.argeo.security.*
 						</Export-Package>
 						<Import-Package>*,
+							org.springframework.context,
 							org.argeo.server.json;resolution:=optional,
 							org.springframework.ldap.core.support;resolution:=optional
 						</Import-Package>
@@ -48,12 +49,16 @@
 			<version>0.1.3-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Spring LDAP -->
-		<!--
-			<dependency> <groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-			</dependency>
-		-->
+		<dependency>
+			<!--
+				Force inclusion of commons.lang to prevent v2.1.0 to be taken by
+				Spring Security
+			-->
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+		</dependency>
+
+		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>org.springframework.ldap</artifactId>
@@ -62,15 +67,9 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.transaction</artifactId>
 		</dependency>
-
-		<!-- Security -->
 		<dependency>
-			<!--
-				Force inclusion of commons.lang to prevent v2.1.0 to be taken by
-				Spring Security
-			-->
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.jms</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -111,6 +110,10 @@
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>com.springsource.javax.jms</artifactId>
+		</dependency>
 
 		<!-- TEST -->
 		<dependency>
diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
index 440a0226c..3860d6770 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
@@ -200,4 +200,8 @@ public class SecuredActiveMqConnectionFactory implements ConnectionFactory,
 		this.brokerURL = brokerUrl;
 	}
 
+	public void setAuthenticationMode(String authenticationMode) {
+		this.authenticationMode = authenticationMode;
+	}
+
 }
diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java
index d53bf7871..730b5af0d 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/MatchingAuthenticationProvider.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.io.IOUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.BadCredentialsException;
@@ -31,7 +30,7 @@ public class MatchingAuthenticationProvider extends
 		try {
 			properties.load(propIn);
 		} finally {
-			IOUtils.closeQuietly(propIn);
+			propIn.close();
 		}
 	}
 
-- 
2.30.2