From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Sep 2012 09:01:21 +0000 (+0000)
Subject: Document ActiveMQ security support
X-Git-Tag: argeo-commons-2.1.30~847
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f6eb3fc88cee5841cd02af099841d6e293b7cc97;p=lgpl%2Fargeo-commons.git

Document ActiveMQ security support

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

diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java
index 5fd48b14c..3d3cbc20b 100644
--- a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java
+++ b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSecurityBrokerPlugin.java
@@ -27,9 +27,10 @@ import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 
 @SuppressWarnings("unchecked")
+/** Integrates Spring Security with ActiveMQ security.*/
 public class ActiveMqSecurityBrokerPlugin extends BrokerPluginSupport {
-//	private final static Log log = LogFactory
-//			.getLog(ActiveMqSecurityBrokerPlugin.class);
+	// private final static Log log = LogFactory
+	// .getLog(ActiveMqSecurityBrokerPlugin.class);
 
 	private AuthenticationManager authenticationManager;
 	private String systemUsername = InternalAuthentication.DEFAULT_SYSTEM_USERNAME;
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java
index 6492d7cd2..feb5ee7f9 100644
--- a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java
+++ b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/ActiveMqSpringSecurityContext.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.context.SecurityContext;
 
+/** An ActiveMQ security context compatible with Spring Security. */
 public class ActiveMqSpringSecurityContext extends
 		org.apache.activemq.security.SecurityContext {
 
@@ -34,8 +35,8 @@ public class ActiveMqSpringSecurityContext extends
 
 	@Override
 	public Set<?> getPrincipals() {
-		return new HashSet<GrantedAuthority>(Arrays
-				.asList(springSecurityContext.getAuthentication()
+		return new HashSet<GrantedAuthority>(
+				Arrays.asList(springSecurityContext.getAuthentication()
 						.getAuthorities()));
 	}
 
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
index 551cd1357..206d468ee 100644
--- a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
+++ b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/SecuredActiveMqConnectionFactory.java
@@ -38,6 +38,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter;
 
+/** An ActiveMQ connection factory managing secure connections. */
 public class SecuredActiveMqConnectionFactory implements ConnectionFactory,
 		InitializingBean, DisposableBean {
 
diff --git a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java
index 0b60c7b0f..38b8ee85c 100644
--- a/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java
+++ b/security/runtime/org.argeo.security.activemq/src/main/java/org/argeo/security/activemq/UserPasswordDialog.java
@@ -30,6 +30,10 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JTextField;
 
+/**
+ * Small Swing-based UI to pass user/name and password. TODO better integrate
+ * with JAAS callbacks.
+ */
 public class UserPasswordDialog extends JDialog implements ActionListener {
 	private static final long serialVersionUID = -9052993072210981198L;
 	private static String OK = "ok";