You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/07/15 13:36:28 UTC
svn commit: r1147104 - in /activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/security/
test/resources/org/apache/activemq/security/
Author: dejanb
Date: Fri Jul 15 11:36:27 2011
New Revision: 1147104
URL: http://svn.apache.org/viewvc?rev=1147104&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3400 - cached ldap autorization module - xbean support
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.xml
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java?rev=1147104&r1=1147103&r2=1147104&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java Fri Jul 15 11:36:27 2011
@@ -19,12 +19,7 @@ package org.apache.activemq.security;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.filter.DestinationMapNode;
-import org.apache.activemq.filter.DestinationNode;
import org.apache.activemq.jaas.GroupPrincipal;
-import org.apache.activemq.security.AuthorizationEntry;
-import org.apache.activemq.security.DefaultAuthorizationMap;
-import org.apache.activemq.security.TempDestinationAuthorizationEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -37,6 +32,13 @@ import javax.naming.directory.*;
import javax.naming.event.*;
import java.util.*;
+
+/**
+ * A {@link DefaultAuthorizationMap} implementation which uses LDAP to initialize and update
+ *
+ * @org.apache.xbean.XBean
+ *
+ */
public class CachedLDAPAuthorizationMap extends DefaultAuthorizationMap implements NamespaceChangeListener,
ObjectChangeListener, InitializingBean {
Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml?rev=1147104&r1=1147103&r2=1147104&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml Fri Jul 15 11:36:27 2011
@@ -39,9 +39,7 @@
<authorizationPlugin>
<map>
- <bean id="CachedLDAPAuthorizationMap" class="org.apache.activemq.security.CachedLDAPAuthorizationMap"
- xmlns="http://www.springframework.org/schema/beans">
- </bean>
+ <cachedLDAPAuthorizationMap/>
</map>
</authorizationPlugin>
</plugins>
Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.xml?rev=1147104&r1=1147103&r2=1147104&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.xml Fri Jul 15 11:36:27 2011
@@ -39,14 +39,13 @@
<authorizationPlugin>
<map>
- <bean id="CachedLDAPAuthorizationMap" class="org.apache.activemq.security.CachedLDAPAuthorizationMap"
- xmlns="http://www.springframework.org/schema/beans">
- <property name="connectionURL" value="ldap://localhost:389" />
- <property name="connectionUsername" value="cn=admin,dc=activemq,dc=apache,dc=org" />
- <property name="connectionPassword" value="sunflower" />
- <property name="baseDn" value="dc=activemq,dc=apache,dc=org" />
- <property name="refreshInterval" value="300000" /> <!-- refresh every 5 min -->
- </bean>
+ <cachedLDAPAuthorizationMap
+ connectionURL="ldap://localhost:389"
+ connectionUsername="cn=admin,dc=activemq,dc=apache,dc=org"
+ connectionPassword="sunflower"
+ baseDn="dc=activemq,dc=apache,dc=org"
+ refreshInterval="300000"
+ />
</map>
</authorizationPlugin>
</plugins>