File: 01_update_ldap_import.diff

package info (click to toggle)
libspring-ldap-java 1.3.1.RELEASE-4
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 2,876 kB
  • sloc: java: 12,509; xml: 4,104; jsp: 36; makefile: 31; sh: 13
file content (20 lines) | stat: -rw-r--r-- 1,013 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Author: Miguel Landaeta <miguel@miguel.cc>
Subject: fix LDAP import

Until J2SE 1.4 com.sun.jndi.ldap.ctl.PagedResultsControl was provided by
LDAP Booster Pack, but since 1.5 this is included as
javax.naming.ldap.PagedResultsControl.

diff --git a/dist/module-sources/spring-ldap-core/org/springframework/ldap/control/PagedResultsCookie.java b/dist/module-sources/spring-ldap-core/org/springframework/ldap/control/PagedResultsCookie.java
index 99da083..816083f 100644
--- a/dist/module-sources/spring-ldap-core/org/springframework/ldap/control/PagedResultsCookie.java
+++ b/dist/module-sources/spring-ldap-core/org/springframework/ldap/control/PagedResultsCookie.java
@@ -20,7 +20,7 @@ import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import com.sun.jndi.ldap.ctl.PagedResultsControl;
+import javax.naming.ldap.PagedResultsControl;
 
 /**
  * Wrapper class for the cookie returned when using the