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

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Nov  5 22:19:59 2013
New Revision: 4938

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4938&view=rev
Log:
Implement ReferenceInsertionEventHandler directly rather than using EscapeReference which has oro dependencies.

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

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4938&r1=4937&r2=4938&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Tue Nov  5 22:19:59 2013
@@ -52,11 +52,6 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.8</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>

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=4938&r1=4937&r2=4938&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 Nov  5 22:19:59 2013
@@ -32,7 +32,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.implement.EscapeReference;
+import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
 import org.ldaptive.SearchFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -148,16 +148,15 @@
         }
 
         final EventCartridge cartridge = new EventCartridge();
-        cartridge.addEventHandler(new EscapeReference() {
-
-            @Override protected String getMatchAttribute() {
-                return "eventhandler.escape.ldap.match";
-            }
-
-            @Override protected String escape(final Object text) {
-                final String value = text.toString();
+        cartridge.addEventHandler(new ReferenceInsertionEventHandler() {
+            
+            @Override public Object referenceInsert(final String reference, final Object value) {
+                if (value == null){ 
+                    return null;
+                }
+                final String text = value.toString();
                 // TODO use ldaptive attribute value encoding
-                return value.replace("\\", "\\5c").replace("*", "\\2a").replace("(", "\\28").replace(")", "\\29")
+                return text.replace("\\", "\\5c").replace("*", "\\2a").replace("(", "\\28").replace(")", "\\29")
                         .replace("\u0000", "\\00");
             }
         });