activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r820766 - in /activemq/branches/activemq-5.3: ./ activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java pom.xml
Date Thu, 01 Oct 2009 19:48:17 GMT
Author: chirino
Date: Thu Oct  1 19:48:17 2009
New Revision: 820766

URL: http://svn.apache.org/viewvc?rev=820766&view=rev
Log:
AMQ-2313: Upgrade ApacheDS dependency to 1.5.5 -  fixes issue wiht jaas LDAP tests on AIX/IBM
jdk


Modified:
    activemq/branches/activemq-5.3/   (props changed)
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
  (props changed)
    activemq/branches/activemq-5.3/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
    activemq/branches/activemq-5.3/pom.xml

Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  1 19:48:17 2009
@@ -1 +1 @@
-/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714
+/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609,818635,818724-818762,818888,818905,818914,818923,818947-818955,818985,820031,820713-820714,820764

Propchange: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  1 19:48:17 2009
@@ -1 +1 @@
-/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714
+/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java:502054-818935,818937-819035,820031,820713-820714,820764

Modified: activemq/branches/activemq-5.3/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java?rev=820766&r1=820765&r2=820766&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
(original)
+++ activemq/branches/activemq-5.3/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
Thu Oct  1 19:48:17 2009
@@ -40,12 +40,10 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-
-
+import org.apache.directory.server.ldap.LdapServer;
 
 @RunWith ( SiRunner.class ) 
 @CleanupLevel ( Level.CLASS )
@@ -72,7 +70,7 @@
     }
     
     private static final String BASE = "ou=system";
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     private static final String FILTER = "(objectclass=*)";
     
     private static final String PRINCIPAL = "uid=admin,ou=system";

Modified: activemq/branches/activemq-5.3/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/pom.xml?rev=820766&r1=820765&r2=820766&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/pom.xml (original)
+++ activemq/branches/activemq-5.3/pom.xml Thu Oct  1 19:48:17 2009
@@ -53,10 +53,7 @@
     <commons-logging-version>1.1</commons-logging-version>
     <commons-pool-version>1.4</commons-pool-version>
     <commons-primitives-version>1.0</commons-primitives-version>
-    <directory-asn1-version>0.3.2</directory-asn1-version>
-    <directory-kerboros-version>0.5</directory-kerboros-version>
-    <directory-mina-version>0.7.3</directory-mina-version>
-    <directory-version>1.5.4</directory-version>
+    <directory-version>1.5.5</directory-version>
     <geronimo-version>1.0</geronimo-version>
     <howl-version>0.1.8</howl-version>
     <hsqldb-version>1.7.2.2</hsqldb-version>
@@ -64,7 +61,7 @@
     <jetty-version>6.1.9</jetty-version>
     <jettison-version>1.1</jettison-version>
     <jmock-version>2.5.1</jmock-version>
-    <junit-version>4.4</junit-version>
+    <junit-version>4.5</junit-version>
     <jxta-version>2.0</jxta-version>
     <log4j-version>1.2.14</log4j-version>
     <nlog4j-version>1.5.2</nlog4j-version>



Mime
View raw message