[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Jan 14 21:22:11 2014
New Revision: 5199

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5199&view=rev
Log:
Finish this TODO.
Inherit ldaptive dependency from the v3 parent project.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
    trunk/idp-parent/pom.xml

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java?rev=5199&r1=5198&r2=5199&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java Tue Jan 14 21:22:11 2014
@@ -150,10 +150,7 @@
                 if (value == null) {
                     return null;
                 }
-                final String text = value.toString();
-                // TODO use ldaptive attribute value encoding
-                return text.replace("\\", "\\5c").replace("*", "\\2a").replace("(", "\\28").replace(")", "\\29")
-                        .replace("\u0000", "\\00");
+                return SearchFilter.encodeValue(value.toString());
             }
         });
         cartridge.attachToContext(context);

Modified: trunk/idp-parent/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-parent/pom.xml?rev=5199&r1=5198&r2=5199&view=diff
==============================================================================
--- trunk/idp-parent/pom.xml (original)
+++ trunk/idp-parent/pom.xml Tue Jan 14 21:22:11 2014
@@ -162,11 +162,6 @@
                 <groupId>net.shibboleth.ext</groupId>
                 <artifactId>spring-extensions</artifactId>
                 <version>1.2-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ldaptive</groupId>
-                <artifactId>ldaptive</artifactId>
-                <version>1.0.1</version>
             </dependency>
             <dependency>
                 <groupId>${spring.groupId}</groupId>