[java-identity-provider] branch maint-3.4 updated: IDP-1401 - Property to allow easier change of LDAP provider

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-3.4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6a5673ef417a39c9ca86bca6dedfee59ce45da9e

The following commit(s) were added to refs/heads/maint-3.4 by this push:
       new  6a5673e   IDP-1401 - Property to allow easier change of LDAP provider
6a5673e is described below

commit 6a5673ef417a39c9ca86bca6dedfee59ce45da9e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 15 21:46:15 2019 -0400

    IDP-1401 - Property to allow easier change of LDAP provider
    
    Default unset IdP property to the underlying ldaptive property when set.
---
 idp-conf/src/main/resources/system/conf/global-system.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index e0c7950..9c3d108 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -1,14 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
        default-init-method="initialize"
        default-destroy-method="destroy">
 
@@ -56,7 +45,7 @@
         <property name="arguments">
             <props>
                 <prop key="org.apache.xml.security.ignoreLineBreaks">%{idp.apache.xml.security.ignoreLineBreaks:true}</prop>
-                <prop key="org.ldaptive.provider">%{idp.ldaptive.provider:org.ldaptive.provider.jndi.JndiProvider}</prop>
+                <prop key="org.ldaptive.provider">%{idp.ldaptive.provider:%{org.ldaptive.provider:org.ldaptive.provider.jndi.JndiProvider}}</prop>
             </props>
         </property>
     </bean>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.