activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1347580 [2/2] - in /activemq/trunk: ./ activemq-core/src/main/java/org/apache/activemq/security/ activemq-core/src/test/java/org/apache/activemq/security/ activemq-core/src/test/resources/org/apache/activemq/security/
Date Thu, 07 Jun 2012 11:58:41 GMT
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java Thu Jun  7 11:58:40 2012
@@ -16,34 +16,16 @@
  */
 package org.apache.activemq.security;
 
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.jaas.GroupPrincipal;
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.BindResponse;
-import org.apache.directory.ldap.client.api.message.ModifyDnResponse;
-import org.apache.directory.ldap.client.api.message.ModifyRequest;
+import org.apache.directory.ldap.client.api.LdapNetworkConnection;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
-import org.junit.Test;
+import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.runner.RunWith;
 
-import java.util.List;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
-
-
+import java.io.InputStream;
 
 
 @RunWith( FrameworkRunner.class )
@@ -51,184 +33,39 @@ import static org.junit.Assert.assertNot
 @ApplyLdifFiles(
         "org/apache/activemq/security/activemq-apacheds.ldif"
 )
-public class CachedLDAPAuthorizationModuleTest extends AbstractLdapTestUnit {
-
-    static final GroupPrincipal GUESTS = new GroupPrincipal("guests");
-    static final GroupPrincipal USERS = new GroupPrincipal("users");
-    static final GroupPrincipal ADMINS = new GroupPrincipal("admins");
-
-    @Test
-    public void testQuery() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-        Set readACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + readACLs, 2, readACLs.size());
-        assertTrue("Contains admin group", readACLs.contains(ADMINS));
-        assertTrue("Contains users group", readACLs.contains(USERS));
-
-        Set failedACLs = map.getReadACLs(new ActiveMQQueue("FAILED"));
-        assertEquals("set size: " + failedACLs, 0, failedACLs.size());
-    }
+public class CachedLDAPAuthorizationModuleTest extends AbstractCachedLDAPAuthorizationModuleTest {
 
-
-    @Test
-    public void testWildcards() throws Exception {
-        CachedLDAPAuthorizationMap map1 = new CachedLDAPAuthorizationMap();
-        map1.query();
-        Set fooACLs = map1.getReadACLs(new ActiveMQQueue("FOO.1"));
-        assertEquals("set size: " + fooACLs, 2, fooACLs.size());
-        assertTrue("Contains admin group", fooACLs.contains(ADMINS));
-        assertTrue("Contains users group", fooACLs.contains(USERS));
-
-        CachedLDAPAuthorizationMap map2 = new CachedLDAPAuthorizationMap();
-        map2.query();
-        Set barACLs = map2.getReadACLs(new ActiveMQQueue("BAR.2"));
-        assertEquals("set size: " + barACLs, 2, barACLs.size());
-        assertTrue("Contains admin group", barACLs.contains(ADMINS));
-        assertTrue("Contains users group", barACLs.contains(USERS));
+    @Override
+    protected CachedLDAPAuthorizationMap createMap() {
+        CachedLDAPAuthorizationMap map = super.createMap();
+        map.setConnectionURL("ldap://localhost:" + getLdapServer().getPort());
+        return map;
     }
-
-    @Test
-    public void testAdvisory() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-        Set readACLs = map.getReadACLs(new ActiveMQTopic("ActiveMQ.Advisory.Connection"));
-        assertEquals("set size: " + readACLs, 2, readACLs.size());
-        assertTrue("Contains admin group", readACLs.contains(ADMINS));
-        assertTrue("Contains users group", readACLs.contains(USERS));
+    
+    @Override
+    protected InputStream getAddLdif() {
+        return getClass().getClassLoader().getResourceAsStream("org/apache/activemq/security/activemq-apacheds-add.ldif");
     }
 
-    @Test
-    public void testTemporary() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-        Thread.sleep(1000);
-        Set readACLs = map.getTempDestinationReadACLs();
-        assertEquals("set size: " + readACLs, 2, readACLs.size());
-        assertTrue("Contains admin group", readACLs.contains(ADMINS));
-        assertTrue("Contains users group", readACLs.contains(USERS));
+    @Override
+    protected InputStream getRemoveLdif() {
+        return getClass().getClassLoader().getResourceAsStream("org/apache/activemq/security/activemq-apacheds-delete.ldif");
     }
 
-    @Test
-    public void testAdd() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-
-        Set failedACLs = map.getReadACLs(new ActiveMQQueue("FAILED"));
-        assertEquals("set size: " + failedACLs, 0, failedACLs.size());
-
-        LdapConnection connection = new LdapConnection( "localhost", 1024 );
-        BindResponse bindResponse = connection.bind("uid=admin,ou=system", "secret");
-        assertNotNull(bindResponse);
-        assertEquals(ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode());
-        assertTrue(connection.isAuthenticated());
-
-
-        LdifReader reader = new LdifReader(getClass().getClassLoader().getResourceAsStream("org/apache/activemq/security/add.ldif"));
-
-        List<LdifEntry> entries = service.getTestEntries();
-        for (LdifEntry entry : reader) {
-            connection.add(entry.getEntry());
-
-        }
-
-        Thread.sleep(2000);
-
-        failedACLs = map.getReadACLs(new ActiveMQQueue("FAILED"));
-        assertEquals("set size: " + failedACLs, 2, failedACLs.size());
-
-        connection.close();
-
-
+    @Override
+    protected String getMemberAttributeValueForModifyRequest() {
+        return "cn=users,ou=Group,ou=ActiveMQ,ou=system";
     }
 
-    @Test
-    public void testRemove() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-
-        Set failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + failedACLs, 2, failedACLs.size());
-
-        LdapConnection connection = new LdapConnection( "localhost", 1024 );
-        BindResponse bindResponse = connection.bind("uid=admin,ou=system", "secret");
-        assertNotNull(bindResponse);
-        assertEquals(ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode());
-        assertTrue(connection.isAuthenticated());
-
-
-        LdifReader reader = new LdifReader(getClass().getClassLoader().getResourceAsStream("org/apache/activemq/security/delete.ldif"));
-
-        List<LdifEntry> entries = service.getTestEntries();
-        for (LdifEntry entry : reader) {
-            connection.delete(entry.getDn());
-        }
-
-        Thread.sleep(2000);
-
-        failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + failedACLs, 0, failedACLs.size());
-
-        connection.close();
-    }
-
-    @Test
-    public void testRename() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-
-        Set failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + failedACLs, 2, failedACLs.size());
-
-        LdapConnection connection = new LdapConnection( "localhost", 1024 );
-        BindResponse bindResponse = connection.bind("uid=admin,ou=system", "secret");
-        assertNotNull(bindResponse);
-        assertEquals(ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode());
-        assertTrue(connection.isAuthenticated());
-
-        ModifyDnResponse resp = connection.rename(new DN("cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system"),
-                new RDN("cn=TEST.BAR"));
-
-        Thread.sleep(2000);
-
-        failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + failedACLs, 0, failedACLs.size());
-
-
-        failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.BAR"));
-        assertEquals("set size: " + failedACLs, 2, failedACLs.size());
-
-        connection.close();
-    }
-
-    @Test
-    public void testChange() throws Exception {
-        CachedLDAPAuthorizationMap map = new CachedLDAPAuthorizationMap();
-        map.query();
-
-        Set failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + failedACLs, 2, failedACLs.size());
-
-        LdapConnection connection = new LdapConnection( "localhost", 1024 );
-        BindResponse bindResponse = connection.bind("uid=admin,ou=system", "secret");
-        assertNotNull(bindResponse);
-        assertEquals(ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode());
-        assertTrue(connection.isAuthenticated());
-
-        DN dn = new DN("cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system");
-
-        ModifyRequest request = new ModifyRequest(dn);
-        request.remove("member", "cn=users");
-
-        connection.modify(request);
-
-        Thread.sleep(2000);
-
-        failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
-        assertEquals("set size: " + failedACLs, 1, failedACLs.size());
-
-        connection.close();
+    protected String getQueueBaseDn() {
+        return "ou=Queue,ou=Destination,ou=ActiveMQ,ou=system";
     }
 
+    @Override
+    protected LdapConnection getLdapConnection() throws Exception {
+        LdapConnection connection = new LdapNetworkConnection("localhost", getLdapServer().getPort());
+        connection.bind(new Dn("uid=admin,ou=system"), "secret");
+        return connection;
+    }    
 }
 

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityLegacyTest.java (from r1346818, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityLegacyTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityLegacyTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityLegacyTest.java Thu Jun  7 11:58:40 2012
@@ -39,9 +39,9 @@ import static org.junit.Assert.fail;
 @RunWith( FrameworkRunner.class )
 @CreateLdapServer(transports = {@CreateTransport(protocol = "LDAP")})
 @ApplyLdifFiles(
-        "org/apache/activemq/security/activemq-apacheds.ldif"
+        "org/apache/activemq/security/activemq-apacheds-legacy.ldif"
 )
-public class CachedLDAPSecurityTest extends AbstractLdapTestUnit {
+public class CachedLDAPSecurityLegacyTest extends AbstractLdapTestUnit {
 
     public BrokerService broker;
 
@@ -49,10 +49,11 @@ public class CachedLDAPSecurityTest exte
 
     @Before
     public void setup() throws Exception {
-       broker = BrokerFactory.createBroker("xbean:org/apache/activemq/security/activemq-apacheds.xml");
-       broker.start();
-       broker.waitUntilStarted();
-       //System.in.read();
+        System.setProperty("ldapPort", String.valueOf(getLdapServer().getPort()));
+        
+        broker = BrokerFactory.createBroker("xbean:org/apache/activemq/security/activemq-apacheds-legacy.xml");
+        broker.start();
+        broker.waitUntilStarted();
     }
 
     @After
@@ -63,7 +64,7 @@ public class CachedLDAPSecurityTest exte
 
     @Test
     public void testSendReceive() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
         Connection conn = factory.createQueueConnection("jdoe", "sunflower");
         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
         conn.start();
@@ -79,7 +80,7 @@ public class CachedLDAPSecurityTest exte
 
     @Test
     public void testSendDenied() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
         Connection conn = factory.createQueueConnection("jdoe", "sunflower");
         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
         conn.start();
@@ -95,7 +96,7 @@ public class CachedLDAPSecurityTest exte
 
     @Test
     public void testCompositeSendDenied() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
         Connection conn = factory.createQueueConnection("jdoe", "sunflower");
         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
         conn.start();
@@ -111,7 +112,7 @@ public class CachedLDAPSecurityTest exte
 
     @Test
     public void testTempDestinations() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost");
         Connection conn = factory.createQueueConnection("jdoe", "sunflower");
         Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
         conn.start();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPSecurityTest.java Thu Jun  7 11:58:40 2012
@@ -16,115 +16,30 @@
  */
 package org.apache.activemq.security;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.server.ldap.LdapServer;
-import org.junit.After;
 import org.junit.Before;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.jms.*;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-
 @RunWith( FrameworkRunner.class )
 @CreateLdapServer(transports = {@CreateTransport(protocol = "LDAP")})
 @ApplyLdifFiles(
         "org/apache/activemq/security/activemq-apacheds.ldif"
 )
-public class CachedLDAPSecurityTest extends AbstractLdapTestUnit {
-
-    public BrokerService broker;
-
-    public static LdapServer ldapServer;
+public class CachedLDAPSecurityTest extends CachedLDAPSecurityLegacyTest {
 
     @Before
+    @Override
     public void setup() throws Exception {
-       broker = BrokerFactory.createBroker("xbean:org/apache/activemq/security/activemq-apacheds.xml");
-       broker.start();
-       broker.waitUntilStarted();
-       //System.in.read();
-    }
-
-    @After
-    public void shutdown() throws Exception {
-        broker.stop();
-        broker.waitUntilStopped();
-    }
-
-    @Test
-    public void testSendReceive() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
-        Connection conn = factory.createQueueConnection("jdoe", "sunflower");
-        Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        conn.start();
-        Queue queue = sess.createQueue("TEST.FOO");
-
-        MessageProducer producer = sess.createProducer(queue);
-        MessageConsumer consumer = sess.createConsumer(queue);
-
-        producer.send(sess.createTextMessage("test"));
-        Message msg = consumer.receive(1000);
-        assertNotNull(msg);
+        System.setProperty("ldapPort", String.valueOf(getLdapServer().getPort()));
+        
+        broker = BrokerFactory.createBroker("xbean:org/apache/activemq/security/activemq-apacheds.xml");
+        broker.start();
+        broker.waitUntilStarted();
     }
-
-    @Test
-    public void testSendDenied() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
-        Connection conn = factory.createQueueConnection("jdoe", "sunflower");
-        Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        conn.start();
-        Queue queue = sess.createQueue("ADMIN.FOO");
-
-        MessageProducer producer = sess.createProducer(queue);
-        try {
-            producer.send(sess.createTextMessage("test"));
-            fail("expect auth exception");
-        } catch (JMSException expected) {
-        }
-    }
-
-    @Test
-    public void testCompositeSendDenied() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
-        Connection conn = factory.createQueueConnection("jdoe", "sunflower");
-        Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        conn.start();
-        Queue queue = sess.createQueue("TEST.FOO,ADMIN.FOO");
-
-        MessageProducer producer = sess.createProducer(queue);
-        try {
-            producer.send(sess.createTextMessage("test"));
-            fail("expect auth exception");
-        } catch (JMSException expected) {
-        }
-    }
-
-    @Test
-    public void testTempDestinations() throws Exception {
-        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
-        Connection conn = factory.createQueueConnection("jdoe", "sunflower");
-        Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        conn.start();
-        Queue queue = sess.createTemporaryQueue();
-
-        MessageProducer producer = sess.createProducer(queue);
-        MessageConsumer consumer = sess.createConsumer(queue);
-
-        producer.send(sess.createTextMessage("test"));
-        Message msg = consumer.receive(1000);
-        assertNotNull(msg);
-    }
-
 }
 
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java Thu Jun  7 11:58:40 2012
@@ -65,7 +65,7 @@ public class LDAPAuthorizationMapTest ex
     @Before
     public void setup() throws Exception {
         authMap = new LDAPAuthorizationMap();
-        authMap.setConnectionURL("ldap://localhost:1024");
+        authMap.setConnectionURL("ldap://localhost:" + getLdapServer().getPort());
         authMap.setTopicSearchMatchingFormat(new MessageFormat("uid={0},ou=topics,ou=destinations,o=ActiveMQ,ou=system"));
         authMap.setQueueSearchMatchingFormat(new MessageFormat("uid={0},ou=queues,ou=destinations,o=ActiveMQ,ou=system"));
         authMap.setAdvisorySearchBase("uid=ActiveMQ.Advisory,ou=topics,ou=destinations,o=ActiveMQ,ou=system");

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPSecurityTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPSecurityTest.java?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPSecurityTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPSecurityTest.java Thu Jun  7 11:58:40 2012
@@ -50,9 +50,11 @@ public class LDAPSecurityTest extends Ab
 
     @Before
     public void setup() throws Exception {
-       broker = BrokerFactory.createBroker("xbean:org/apache/activemq/security/activemq-ldap.xml");
-       broker.start();
-       broker.waitUntilStarted();
+        System.setProperty("ldapPort", String.valueOf(getLdapServer().getPort()));
+        
+        broker = BrokerFactory.createBroker("xbean:org/apache/activemq/security/activemq-ldap.xml");
+        broker.start();
+        broker.waitUntilStarted();
     }
 
     @After

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-add.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-add.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-add.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-add.ldif Thu Jun  7 11:58:40 2012
@@ -27,15 +27,15 @@ objectClass: top
 dn: cn=admin,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
@@ -43,5 +43,5 @@ dn: cn=write,cn=FAILED,ou=Queue,ou=Desti
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
\ No newline at end of file
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-delete.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-delete.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-delete.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-delete.ldif Thu Jun  7 11:58:40 2012
@@ -15,14 +15,26 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
-changetype: delete
-
 dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 changetype: delete
+ 
 
 dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 changetype: delete
 
 dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
-changetype: delete
\ No newline at end of file
+changetype: delete
+
+dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+dn: cn=read,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+dn: cn=write,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+dn: cn=admin,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-add.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-add.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-add.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-add.ldif Thu Jun  7 11:58:40 2012
@@ -44,4 +44,4 @@ cn: write
 objectClass: groupOfNames
 objectClass: top
 member: cn=users
-member: cn=admins
\ No newline at end of file
+member: cn=admins

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-delete.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-delete.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-delete.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy-delete.ldif Thu Jun  7 11:58:40 2012
@@ -15,9 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
-changetype: delete
-
 dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 changetype: delete
 
@@ -25,4 +22,17 @@ dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Dest
 changetype: delete
 
 dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
-changetype: delete
\ No newline at end of file
+changetype: delete
+
+dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+dn: cn=read,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+dn: cn=write,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+
+dn: cn=admin,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
+changetype: delete
+

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy.ldif Thu Jun  7 11:58:40 2012
@@ -20,12 +20,6 @@
 ## Define basic objects ##
 ##########################
 
-# Uncomment if adding to open ldap
-# dn: ou=system
-# objectclass: organizationalUnit
-# objectclass: top
-# ou: system
-
 dn: ou=ActiveMQ,ou=system
 objectClass: organizationalUnit
 objectClass: top
@@ -267,4 +261,4 @@ cn: admin
 member: cn=admins
 member: cn=users
 objectClass: groupOfNames
-objectClass: top
\ No newline at end of file
+objectClass: top

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy.xml (from r1346818, 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-legacy.xml?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds-legacy.xml&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.xml&r1=1346818&r2=1347580&rev=1347580&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-legacy.xml Thu Jun  7 11:58:40 2012
@@ -39,16 +39,10 @@
 
           <authorizationPlugin>
               <map>
-                    <cachedLDAPAuthorizationMap/>
+                <cachedLDAPAuthorizationMap connectionURL="ldap://localhost:${ldapPort}"/>
               </map>
           </authorizationPlugin>
       </plugins>
-
-
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616"/>
-    </transportConnectors>
-
   </broker>
 
 </beans>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-apacheds.ldif Thu Jun  7 11:58:40 2012
@@ -20,12 +20,6 @@
 ## Define basic objects ##
 ##########################
 
-# Uncomment if adding to open ldap
-# dn: ou=system
-# objectclass: organizationalUnit
-# objectclass: top
-# ou: system
-
 dn: ou=ActiveMQ,ou=system
 objectClass: organizationalUnit
 objectClass: top
@@ -57,13 +51,13 @@ ou: Group
 
 dn: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 cn: admins
-member: uid=admin
+member: uid=admin,ou=User,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=users,ou=Group,ou=ActiveMQ,ou=system
 cn: users
-member: uid=jdoe
+member: uid=jdoe,ou=User,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
@@ -127,15 +121,15 @@ objectClass: top
 dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
@@ -143,9 +137,41 @@ dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Des
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+
+## TEST.FOOBAR
+
+dn: cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+cn: TEST.BAR
+description: A queue
+objectClass: applicationProcess
+objectClass: top
+
+dn: cn=admin,cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+cn: admin
+description: Admin privilege group, members are roles
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+objectClass: groupOfNames
+objectClass: top
+
+dn: cn=read,cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+cn: read
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: uid=jdoe,ou=User,ou=ActiveMQ,ou=system
+member: cn=notthere,ou=Group,ou=ActiveMQ,ou=system
+objectClass: groupOfNames
+objectClass: top
 
+dn: cn=write,cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+cn: write
+objectClass: groupOfNames
+objectClass: top
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: uid=jdoe,ou=User,ou=ActiveMQ,ou=system
 
 ## FOO.>
 
@@ -158,15 +184,15 @@ objectClass: top
 dn: cn=admin,cn=FOO.$,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=FOO.$,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
@@ -174,9 +200,8 @@ dn: cn=write,cn=FOO.$,ou=Queue,ou=Destin
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
-
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 
 ## BAR.*
 
@@ -189,15 +214,15 @@ objectClass: top
 dn: cn=admin,cn=BAR.*,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=BAR.*,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
@@ -205,8 +230,8 @@ dn: cn=write,cn=BAR.*,ou=Queue,ou=Destin
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
 
 #######################
 ## Define advisories ##
@@ -220,22 +245,22 @@ description: Advisory topics
 
 dn: cn=read,cn=ActiveMQ.Advisory.$,ou=Topic,ou=Destination,ou=ActiveMQ,ou=system
 cn: read
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=write,cn=ActiveMQ.Advisory.$,ou=Topic,ou=Destination,ou=ActiveMQ,ou=system
 cn: write
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=admin,cn=ActiveMQ.Advisory.$,ou=Topic,ou=Destination,ou=ActiveMQ,ou=system
 cn: admin
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
@@ -250,21 +275,21 @@ ou: Temp
 
 dn: cn=read,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
 cn: read
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=write,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
 cn: write
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=admin,ou=Temp,ou=Destination,ou=ActiveMQ,ou=system
 cn: admin
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,ou=system
+member: cn=users,ou=Group,ou=ActiveMQ,ou=system
 objectClass: groupOfNames
-objectClass: top
\ No newline at end of file
+objectClass: top

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=1347580&r1=1347579&r2=1347580&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 Thu Jun  7 11:58:40 2012
@@ -39,16 +39,10 @@
 
           <authorizationPlugin>
               <map>
-                    <cachedLDAPAuthorizationMap/>
+                <cachedLDAPAuthorizationMap legacyGroupMapping="false" connectionURL="ldap://localhost:${ldapPort}"/>
               </map>
           </authorizationPlugin>
       </plugins>
-
-
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616"/>
-    </transportConnectors>
-
   </broker>
 
 </beans>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-ldap.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-ldap.xml?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-ldap.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-ldap.xml Thu Jun  7 11:58:40 2012
@@ -46,7 +46,7 @@
                   <bean id="lDAPAuthorizationMap" class="org.apache.activemq.security.LDAPAuthorizationMap"
                         xmlns="http://www.springframework.org/schema/beans">
                       <property name="initialContextFactory" value="com.sun.jndi.ldap.LdapCtxFactory"/>
-                      <property name="connectionURL" value="ldap://localhost:1024"/>
+                      <property name="connectionURL" value="ldap://localhost:${ldapPort}"/>
                       <property name="authentication" value="simple"/>
                       <property name="connectionUsername" value="uid=admin,ou=system"/>
                       <property name="connectionPassword" value="secret"/>

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-add.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-add.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-add.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-add.ldif Thu Jun  7 11:58:40 2012
@@ -18,30 +18,30 @@
 
 ## FAILED
 
-dn: cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: FAILED
 description: New queue
 objectClass: applicationProcess
 objectClass: top
 
-dn: cn=admin,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=admin,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
-dn: cn=read,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=read,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
-dn: cn=write,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=write,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
\ No newline at end of file
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-delete.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-delete.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-delete.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-delete.ldif Thu Jun  7 11:58:40 2012
@@ -15,14 +15,24 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 changetype: delete
 
-dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 changetype: delete
 
-dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=read,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=write,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=admin,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 changetype: delete
 
-dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
-changetype: delete
\ No newline at end of file

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-add.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-add.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-add.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/add.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-add.ldif Thu Jun  7 11:58:40 2012
@@ -18,13 +18,13 @@
 
 ## FAILED
 
-dn: cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: FAILED
 description: New queue
 objectClass: applicationProcess
 objectClass: top
 
-dn: cn=admin,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=admin,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
 description: Admin privilege group, members are roles
 member: cn=admins
@@ -32,16 +32,16 @@ member: cn=users
 objectClass: groupOfNames
 objectClass: top
 
-dn: cn=read,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=read,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
 member: cn=users
 member: cn=admins
 objectClass: groupOfNames
 objectClass: top
 
-dn: cn=write,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=write,cn=FAILED,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: write
 objectClass: groupOfNames
 objectClass: top
 member: cn=users
-member: cn=admins
\ No newline at end of file
+member: cn=admins

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-delete.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-delete.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-delete.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/delete.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy-delete.ldif Thu Jun  7 11:58:40 2012
@@ -15,14 +15,24 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 changetype: delete
 
-dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 changetype: delete
 
-dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
+dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=read,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=write,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+changetype: delete
+
+dn: cn=admin,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 changetype: delete
 
-dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,ou=system
-changetype: delete
\ No newline at end of file

Copied: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy.ldif (from r1346818, activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy.ldif?p2=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy.ldif&p1=activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif&r1=1346818&r2=1347580&rev=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap-legacy.ldif Thu Jun  7 11:58:40 2012
@@ -20,11 +20,18 @@
 ## Define basic objects ##
 ##########################
 
-# Uncomment if adding to open ldap
+dn: dc=apache,dc=org
+objectClass: dcObject
+objectClass: organization
+dc: apache
+o: Apache
+
 dn: dc=activemq,dc=apache,dc=org
-dc: activemq
-objectClass: domain
+objectClass: dcObject
+objectClass: container
 objectClass: top
+cn: activemq
+dc: activemq
 
 dn: ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: organizationalUnit
@@ -81,15 +88,18 @@ ou: User
 dn: uid=admin,ou=User,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 uid: admin
 userPassword: {SSHA}YvMAkkd66cDecNoejo8jnw5uUUBziyl0
-objectClass: account
-objectClass: simpleSecurityObject
-objectClass: top
+objectclass: uidObject
+objectclass: organizationalPerson
+objectclass: person
+objectclass: top
+cn: Admin
+sn: Admin
 
 
 dn: uid=jdoe,ou=User,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 uid: jdoe
 userPassword: {SSHA}YvMAkkd66cDecNoejo8jnw5uUUBziyl0
-objectclass: inetOrgPerson
+objectclass: uidObject
 objectclass: organizationalPerson
 objectclass: person
 objectclass: top
@@ -267,4 +277,5 @@ cn: admin
 member: cn=admins
 member: cn=users
 objectClass: groupOfNames
-objectClass: top
\ No newline at end of file
+objectClass: top
+

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/activemq-openldap.ldif Thu Jun  7 11:58:40 2012
@@ -20,11 +20,18 @@
 ## Define basic objects ##
 ##########################
 
-# Uncomment if adding to open ldap
+dn: dc=apache,dc=org
+objectClass: dcObject
+objectClass: organization
+dc: apache
+o: Apache
+
 dn: dc=activemq,dc=apache,dc=org
-dc: activemq
-objectClass: domain
+objectClass: dcObject
+objectClass: container
 objectClass: top
+cn: activemq
+dc: activemq
 
 dn: ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: organizationalUnit
@@ -81,15 +88,18 @@ ou: User
 dn: uid=admin,ou=User,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 uid: admin
 userPassword: {SSHA}YvMAkkd66cDecNoejo8jnw5uUUBziyl0
-objectClass: account
-objectClass: simpleSecurityObject
-objectClass: top
+objectclass: uidObject
+objectclass: organizationalPerson
+objectclass: person
+objectclass: top
+cn: Admin
+sn: Admin
 
 
 dn: uid=jdoe,ou=User,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 uid: jdoe
 userPassword: {SSHA}YvMAkkd66cDecNoejo8jnw5uUUBziyl0
-objectclass: inetOrgPerson
+objectclass: uidObject
 objectclass: organizationalPerson
 objectclass: person
 objectclass: top
@@ -127,15 +137,15 @@ objectClass: top
 dn: cn=admin,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=TEST.FOO,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
@@ -143,9 +153,41 @@ dn: cn=write,cn=TEST.FOO,ou=Queue,ou=Des
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+
+## TEST.FOOBAR
+
+dn: cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+cn: TEST.BAR
+description: A queue
+objectClass: applicationProcess
+objectClass: top
+
+dn: cn=admin,cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+cn: admin
+description: Admin privilege group, members are roles
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+objectClass: groupOfNames
+objectClass: top
+
+dn: cn=read,cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+cn: read
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: uid=jdoe,ou=User,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=notthere,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+objectClass: groupOfNames
+objectClass: top
 
+dn: cn=write,cn=TEST.FOOBAR,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+cn: write
+objectClass: groupOfNames
+objectClass: top
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: uid=jdoe,ou=User,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 
 ## FOO.>
 
@@ -158,15 +200,15 @@ objectClass: top
 dn: cn=admin,cn=FOO.$,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=FOO.$,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
@@ -174,9 +216,8 @@ dn: cn=write,cn=FOO.$,ou=Queue,ou=Destin
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
-
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 
 ## BAR.*
 
@@ -189,15 +230,15 @@ objectClass: top
 dn: cn=admin,cn=BAR.*,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
 description: Admin privilege group, members are roles
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=read,cn=BAR.*,ou=Queue,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
@@ -205,8 +246,8 @@ dn: cn=write,cn=BAR.*,ou=Queue,ou=Destin
 cn: write
 objectClass: groupOfNames
 objectClass: top
-member: cn=users
-member: cn=admins
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 
 #######################
 ## Define advisories ##
@@ -220,22 +261,22 @@ description: Advisory topics
 
 dn: cn=read,cn=ActiveMQ.Advisory.$,ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=write,cn=ActiveMQ.Advisory.$,ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: write
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=admin,cn=ActiveMQ.Advisory.$,ou=Topic,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
@@ -250,21 +291,22 @@ ou: Temp
 
 dn: cn=read,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: read
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=write,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: write
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
 objectClass: top
 
 dn: cn=admin,ou=Temp,ou=Destination,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 cn: admin
-member: cn=admins
-member: cn=users
+member: cn=admins,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
+member: cn=users,ou=Group,ou=ActiveMQ,dc=activemq,dc=apache,dc=org
 objectClass: groupOfNames
-objectClass: top
\ No newline at end of file
+objectClass: top
+

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=1347580&r1=1347579&r2=1347580&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 Thu Jun  7 11:58:40 2012
@@ -41,11 +41,10 @@
               <map>
                   <cachedLDAPAuthorizationMap
                       connectionURL="ldap://localhost:389"
-                      connectionUsername="cn=admin,dc=activemq,dc=apache,dc=org"
+                      connectionUsername="cn=mqbroker,ou=Services,dc=activemq,dc=apache,dc=org"
                       connectionPassword="sunflower"
                       baseDn="dc=activemq,dc=apache,dc=org"
-                      refreshInterval="300000"
-                   />
+                      refreshInterval="300000" />
               </map>
           </authorizationPlugin>
       </plugins>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1347580&r1=1347579&r2=1347580&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu Jun  7 11:58:40 2012
@@ -60,7 +60,7 @@
     <commons-pool-version>1.5.6</commons-pool-version>
     <commons-primitives-version>1.0</commons-primitives-version>
     <commons-net-version>2.2</commons-net-version>
-    <directory-version>1.5.7</directory-version>
+    <directory-version>2.0.0-M6</directory-version>
     <fusemq-leveldb-version>1.2</fusemq-leveldb-version>
     <geronimo-version>1.0</geronimo-version>
     <howl-version>0.1.8</howl-version>



Mime
View raw message