[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt pom.xml src/main/java/edu/internet2/middleware/sh...

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Feb 23 15:10:40 2012
New Revision: 1015

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1015&view=rev
Log:
expose blockWait LDAP connection pool property as a configuration option - SC-170
harmonize the way the two LDAP connection pooling impls fail when there is a configuration/server problem - SC-173
use latest opensaml version - SC-174

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/pom.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapDataConnector.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolEmptyStrategy.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolStrategy.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolVTStrategy.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorBeanDefinitionParser.java
    branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-resolver-dc.xsd

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1015&r1=1014&r2=1015&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Thu Feb 23 15:10:40 2012
@@ -1,8 +1,10 @@
 Changes in Release 1.3.5
 =============================================
 [SC-169] - Velocity ErrorHandler doesn't set Content-Type of response
-[SC-170] - Move pool initialization to protected method on DataConnector bean factory
+[SC-170] - Expose LDAP pool blockWaitTime on VT pool strategy via connector config
 [SC-171] - Bump Spring dependencies to the newest security patch release (SEC03)
+[SC-173] - LdapPoolEmptyStrategy should check that a connection to the LDAP server can be established during its initialization
+[SC-174] - Update OpenSAML library to 2.5.3
 
 Changes in Release 1.3.4
 =============================================

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1015&r1=1014&r2=1015&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Thu Feb 23 15:10:40 2012
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.opensaml</groupId>
             <artifactId>opensaml</artifactId>
-            <version>2.5.2</version>
+            <version>2.5.3</version>
         </dependency>
         <dependency>
             <groupId>org.jgrapht</groupId>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>edu.vt.middleware</groupId>
             <artifactId>vt-ldap</artifactId>
-            <version>3.3.4</version>
+            <version>3.3.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapDataConnector.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapDataConnector.java?rev=1015&r1=1014&r2=1015&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapDataConnector.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapDataConnector.java Thu Feb 23 15:10:40 2012
@@ -115,7 +115,7 @@
     };
 
     /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(LdapDataConnector.class);
+    private final Logger log = LoggerFactory.getLogger(LdapDataConnector.class);
 
     /** Ldap pool strategy. */
     private LdapPoolStrategy ldapPool;

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolEmptyStrategy.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolEmptyStrategy.java?rev=1015&r1=1014&r2=1015&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolEmptyStrategy.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolEmptyStrategy.java Thu Feb 23 15:10:40 2012
@@ -17,14 +17,23 @@
 

[... 479 lines stripped ...]