debian/0002755000000000000000000000000011724744210007172 5ustar debian/source/0002755000000000000000000000000011724743746010507 5ustar debian/source/format0000644000000000000000000000001411724743746011713 0ustar 3.0 (quilt) debian/libspring-ldap-java-doc.doc-base.20000644000000000000000000000061111724743746015333 0ustar Document: libspring-ldap-java-doc2 Title: Spring LDAP - Reference Documentation Abstract: Framework that provides excellent utilities for simplifying LDAP programming. Author: Mattias Arthursson, Ulrik Sandberg, Eric Dalquist Section: Programming Format: HTML Index: /usr/share/doc/libspring-ldap-java/reference/html/index.html Files: /usr/share/doc/libspring-ldap-java/reference/html/*.html debian/libspring-ldap-java.poms0000644000000000000000000000036511724743746013737 0ustar debian/poms/spring-ldap-parent.pom debian/poms/spring-ldap-core.pom --artifact=build/dist/spring-ldap-core-1.*.RELEASE.jar --java-lib debian/poms/spring-ldap-core-tiger.pom --artifact=build/dist/spring-ldap-core-tiger-1.*.RELEASE.jar --java-lib debian/classpath-debian0000644000000000000000000000045511724743746012336 0ustar usr/share/java/spring3-core.jar usr/share/java/spring3-beans.jar usr/share/java/spring3-context.jar usr/share/java/spring3-jdbc.jar usr/share/java/spring3-orm.jar usr/share/java/spring3-transaction.jar usr/share/java/commons-lang.jar usr/share/java/commons-logging.jar usr/share/java/commons-pool.jar debian/poms/0002755000000000000000000000000011724743746010165 5ustar debian/poms/spring-ldap-parent.pom0000644000000000000000000004425611724743746014422 0ustar 4.0.0 org.springframework.ldap spring-ldap-parent pom 1.3.1.RELEASE Spring LDAP - Parent tiger http://static.springframework.org/spring-ldap/site/downloads/releases.html spring-release Spring Release Repository s3://maven.springframework.org/release spring-snapshot Spring Snapshot Repository s3://maven.springframework.org/snapshot static.springframework.org scp://spring02.managed.contegix.com/opt/www/domains/springframework.org/www/htdocs/spring-ldap/sites/1.3 scm:svn:https://src.springframework.org/svn/spring-ldap/tags/spring-ldap-1.3.1.RELEASE scm:svn:https://src.springframework.org/svn/spring-ldap/tags/spring-ldap-1.3.1.RELEASE https://fisheye.springsource.org/changelog/~br=trunk/spring-ldap/tags/spring-ldap-1.3.1.RELEASE UTF-8 3.0.5.RELEASE 4.8.2 maven central repo http://repo1.maven.org/maven2/ java.net repo http://download.java.net/maven/2/ spring release http://maven.springframework.org/release/ spring external http://maven.springframework.org/external/ Codehaus http://repository.codehaus.org/ false true Codehaus http://repository.codehaus.org/ false true maven-jxr-plugin 2.2 true maven-surefire-report-plugin 2.6 true maven-surefire-plugin 2.6 once false maven-resources-plugin 2.4.1 maven-project-info-reports-plugin 2.2 maven-site-plugin 2.1.1 maven-install-plugin 2.3 maven-deploy-plugin 2.5 maven-dependency-plugin 2.1 maven-clean-plugin 2.4 maven-assembly-plugin 2.2-beta-5 com.agilejava.docbkx docbkx-maven-plugin 2.0.7 maven-javadoc-plugin 2.7 ${project.build.sourceEncoding} true true
Spring LDAP Framework
true ${basedir}/src/main/javadoc/javadoc.css ${basedir}/src/main/javadoc/overview.html ${basedir}/src/main/javadoc org.springframework.ldap.samples:org.springframework.ldap.itest http://download.oracle.com/javase/1.4.2/docs/api http://download.oracle.com/javase/1.5.0/docs/api http://static.springframework.org/spring/docs/2.5.x/api/ http://logging.apache.org/log4j/1.2/apidocs/ http://commons.apache.org/logging/apidocs/ http://commons.apache.org/dbcp/apidocs/ http://commons.apache.org/pool/apidocs/ http://junit.sourceforge.net/javadoc/ maven-eclipse-plugin 2.7 org.springframework.ide.eclipse.core.springnature org.springframework.ide.eclipse.core.springbuilder true package.html maven-idea-plugin 2.2 true org.codehaus.mojo cobertura-maven-plugin 2.4 org.codehaus.mojo findbugs-maven-plugin 2.3.1 org.mortbay.jetty maven-jetty-plugin 6.1.21 org.apache.maven.plugins maven-war-plugin 2.1-beta-1 maven-jar-plugin 2.3 maven-compiler-plugin 2.1 org.springframework.build.aws org.springframework.build.aws.maven 3.0.0.RELEASE maven-compiler-plugin maven-surefire-plugin maven-jar-plugin true ${project.version} maven-eclipse-plugin maven-idea-plugin org.codehaus.mojo cobertura-maven-plugin clean **/*.class **/DnParserImpl*.class **/TokenMgrError.class **/ParseException.class **/Token.class **/SimpleCharStream.class org.codehaus.mojo findbugs-maven-plugin 2.3.1 maven-jxr-plugin 2.2 maven-surefire-report-plugin 2.6 maven-project-info-reports-plugin 2.2 maven-javadoc-plugin 2.5 javadoc org.codehaus.mojo cobertura-maven-plugin 2.4 org.springframework.ldap spring-ldap-core ${project.version} org.springframework.ldap spring-ldap-core-tiger ${project.version} org.springframework.ldap spring-ldap-test ${project.version} org.springframework.ldap spring-ldap-samples-utils ${project.version} org.springframework spring-core ${spring.version} org.springframework spring-beans ${spring.version} org.springframework spring-context ${spring.version} org.springframework spring-aop ${spring.version} org.springframework spring-web ${spring.version} org.springframework spring-webmvc ${spring.version} struts struts org.springframework spring-orm ${spring.version} org.springframework spring-jdbc ${spring.version} org.springframework spring-tx ${spring.version} org.springframework spring-test ${spring.version} test org.acegisecurity acegi-security 1.0.7 aspectj aspectj cas casclient commons-codec commons-codec commons-collections commons-collections commons-lang commons-lang commons-logging commons-logging hsqldb hsqldb javax.servlet jsp-api javax.servlet servlet-api jmock jmock log4j log4j net.sj.ehcache ehcache org.apache.directory.server apacheds-core org.slf4j slf4j-log4j12 org.springframework spring-core org.springframework spring-jdbc org.springframework spring-ldap org.springframework spring-mock org.springframework spring-remoting org.springframework spring-support org.springframework spring-web oro oro taglibs standard org.springframework.security spring-security-core 2.0.2 org.springframework.security spring-security-core-tiger 2.0.2 javax.servlet servlet-api 2.5 provided commons-lang commons-lang 2.5 commons-pool commons-pool 1.5.4 commons-cli commons-cli 1.2 commons-codec commons-codec 1.4 org.freemarker freemarker 2.3.9 commons-logging commons-logging 1.0.4 log4j log4j 1.2.9 true junit junit ${junit.version} test easymock easymock 1.2_Java1.3 test gsbase gsbase 2.0.1 test jdepend jdepend 2.9.1 jar test commons-logging commons-logging org.springframework spring-core org.springframework spring-beans junit junit test log4j log4j test debian/poms/spring-ldap-core-tiger.pom0000644000000000000000000000257411724743746015166 0ustar org.springframework.ldap spring-ldap-parent 1.3.1.RELEASE ../parent 4.0.0 spring-ldap-core-tiger jar Spring LDAP Java 5 support org.apache.maven.plugins maven-compiler-plugin 1.5 1.5 org.springframework.ldap spring-ldap-core org.springframework spring-tx junit junit org.easymock easymock 2.5.1 test debian/poms/spring-ldap-core.pom0000644000000000000000000000537011724743746014053 0ustar org.springframework.ldap spring-ldap-parent 1.3.1.RELEASE ../parent 4.0.0 spring-ldap-core jar Spring LDAP Core maven-compiler-plugin 1.4 1.4 org.codehaus.mojo javacc-maven-plugin 2.5 javacc commons-logging commons-logging commons-lang commons-lang commons-pool commons-pool provided com.sun ldapbp 1.0 provided org.springframework spring-core org.springframework spring-beans org.springframework spring-tx org.springframework spring-context provided org.springframework spring-jdbc provided org.springframework spring-orm provided junit junit test easymock easymock test gsbase gsbase test debian/orig-tar.sh0000755000000000000000000000124511724743746011272 0ustar #!/bin/sh set -e # called by uscan with '--upstream-version' echo "version $2" upstream_package="spring-ldap" package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` debian_version=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p'` DOCS_URL="https://src.springframework.org/svn/spring-ldap/tags/spring-ldap-$2/src/docbkx/" TAR=${package}_${debian_version}.orig.tar.gz DIR=${package}-${debian_version}.orig # clean up the upstream sources unzip $3 && mv ${upstream_package}-$2 $DIR svn export $DOCS_URL $DIR/docs/docbkx GZIP=--best tar --numeric --group 0 --owner 0 --anchored \ -X debian/orig-tar.excludes -c -v -z -f $TAR $DIR rm -rf $3 $DIR debian/changelog0000644000000000000000000000435411724743746011065 0ustar libspring-ldap-java (1.3.1.RELEASE-4) unstable; urgency=low * Replace dependencies on Servlet 2.4 library with 2.5. (Closes: #658808). * Fix missing-build-dependency-for-dh-addon maven_repo_helper lintian warning. * Bump Standards-Version to 3.9.3. No changes were required. -- Miguel Landaeta Fri, 02 Mar 2012 23:15:39 -0430 libspring-ldap-java (1.3.1.RELEASE-3) unstable; urgency=low * Fixed issue with generated POM files not mapping to Spring 3.x artifacts: - debian/maven.rules: map to 3.x Spring Artifacts. - debian/maven.ignoreRules: strip out test + other dependencies which are not required at runtime. -- James Page Mon, 04 Jul 2011 13:56:16 +0100 libspring-ldap-java (1.3.1.RELEASE-2) unstable; urgency=low * Added maven artifact deployment (Closes: #632085): - debian/rules: added target to retrieve original pom files, use --with maven-repo-helper - debian/poms/*: pom files for maven deployment - debian/libspring-ldap-java.poms: pom file deployment descriptor - debian/control: added maven-repo-helper -- James Page Wed, 29 Jun 2011 15:53:25 +0100 libspring-ldap-java (1.3.1.RELEASE-1) unstable; urgency=low * New upstream release. * Update copyright dates. * Bump Standards-Version to 3.9.2. No changes were required. * Wrap correctly Depends and Build-Depends lists. * Simplify javadoc generation using packagesets. * Link javadoc to system javadoc and add B-D on default-jdk-doc. * Add B-D on libservlet2.4-java since it is needed by fop. * Make copyright file DEP-5 compliant. * Call dh7 script with a correct ordering of arguments. * Replace https URL in watch file to avoid issues with SSL certificates. -- Miguel Landaeta Sun, 10 Apr 2011 17:58:25 -0430 libspring-ldap-java (1.3.0.RELEASE-2) experimental; urgency=low * Rebuild against Spring Framework 3.0 libraries. * Bump Standards-Version to 3.9.1. No changes were required. -- Miguel Landaeta Mon, 04 Oct 2010 19:21:42 -0430 libspring-ldap-java (1.3.0.RELEASE-1) unstable; urgency=low * Initial release (Closes: #576622), -- Miguel Landaeta Fri, 16 Apr 2010 20:36:56 -0430 debian/copyright0000644000000000000000000000201111724743746011132 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 Upstream-Name: Spring LDAP Upstream-Contact: SpringSource Inc. Source: http://www.springsource.com/download/community Files: * Copyright: © 2002-2010, SpringSource Inc. License: Apache-2.0 Files: debian/* Copyright: © 2010-2011, Miguel Landaeta License: Apache-2.0 License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 /usr/share/common-licenses/Apache-2.0 (on Debian systems) . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. debian/compat0000644000000000000000000000000211724743746010403 0ustar 7 debian/control0000644000000000000000000000410511724743746010610 0ustar Source: libspring-ldap-java Maintainer: Debian Java Maintainers Uploaders: Miguel Landaeta , James Page Section: java Priority: optional Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, default-jdk, javahelper, javacc, libspring-core-java, libspring-beans-java, libspring-context-java, libspring-jdbc-java, libspring-orm-java, libspring-transaction-java, libcommons-lang-java, libcommons-logging-java, libcommons-pool-java, xmlto, fop, libservlet2.5-java, default-jdk-doc, maven-repo-helper (>= 1.5~) Standards-Version: 3.9.3 Homepage: http://www.springsource.org/ldap Vcs-Git: git://git.debian.org/git/pkg-java/libspring-ldap-java.git Vcs-Browser: http://git.debian.org/?p=pkg-java/libspring-ldap-java.git Package: libspring-ldap-java Architecture: all Depends: libspring-core-java, libspring-beans-java, libcommons-lang-java, libcommons-logging-java, ${misc:Depends} Recommends: libspring-jdbc-java, libspring-transaction-java Suggests: libspring-context-java, libcommons-pool-java, libspring-ldap-java-doc Description: Java library for simpler LDAP programming Spring LDAP is built on the same principles as the JdbcTemplate in Spring JDBC. It completely eliminates the need to worry about creating and closing LdapContext and looping through NamingEnumeration. It also provides a more comprehensive unchecked Exception hierarchy, built on Spring's DataAccessException. As a bonus, it also contains classes for dynamically building LDAP filters and DNs (Distinguished Names), LDAP attribute management, and client-side LDAP transaction management. Package: libspring-ldap-java-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: libspring-ldap-java (= ${binary:Version}), default-jdk-doc Description: documentation for libspring-ldap-java Documentation for Spring LDAP, that is a Java library built on the same principles as the JdbcTemplate in Spring JDBC. It completely eliminates the need to worry about creating and closing LdapContext and looping through NamingEnumeration. debian/build.properties0000644000000000000000000000164211724743746012425 0ustar version=1.3.1.RELEASE debug=on target=1.5 dir.build=${basedir}/../build dir.src=${basedir}/../dist/module-sources dir.javacchome=/usr/share/java dir.build.api=${basedir}/../build/api dir.docs=${basedir}/../docs dir.src.spring-ldap-core=${dir.src}/spring-ldap-core dir.src.spring-ldap-core-tiger=${dir.src}/spring-ldap-core-tiger dir.src.spring-ldap-core-test=${dir.src}/spring-ldap-test classpath.spring-ldap-core="spring3-core.jar spring3-beans.jar spring3-context.jar spring3-jdbc.jar spring3-orm.jar spring3-transaction.jar commons-lang.jar commons-logging.jar commons-pool.jar" classpath.spring-ldap-core-tiger="spring-ldap-core.jar spring3-transaction.jar" dist.file.spring-ldap-core=${basedir}/../build/dist/spring-ldap-core-${version}.jar dist.file.spring-ldap-core-tiger=${basedir}/../build/dist/spring-ldap-core-tiger-${version}.jar dist.file.spring-ldap-test=${basedir}/../build/dist/spring-ldap-test-${version}.jar debian/build.xml0000644000000000000000000000663211724743746011035 0ustar debian/README.source0000644000000000000000000000103411724743746011362 0ustar The upstream tarball has been modified as follows, to comply with DFSG: * All .jar files under lib directory have been removed since Debian packages must build with libraries installed on system. * All files under docs/api and docs/reference were removed since those files can be regenerated during build-time. * All .jar files under dist and dist/modules directories have been removed since those libraries are regenerated during build time. -- Miguel Landaeta Fri, 16 Apr 2010 19:42:58 -0430 debian/README.Debian0000644000000000000000000000076011724743746011251 0ustar ------------------------------ libspring-ldap-java for Debian ------------------------------ *** Removal of functionalities *** Spring LDAP Debian package doesn't contains some of the functionalities of upstream binary releases. Here is a list of excluded files regarding original content of Spring LDAP: * spring-ldap-test.jar was not built because: [not-in-debian] Typica [non-in-debian] Apache Directory Server -- Miguel Landaeta Tue, 06 Apr 2010 20:30:51 -0430 debian/rules0000755000000000000000000000220611724743746010265 0ustar #!/usr/bin/make -f %: dh $@ --with javahelper --with maven-repo-helper override_dh_auto_clean: dh_auto_clean -ant -f debian/build.xml clean override_dh_auto_build: dh_auto_build ant -f debian/build.xml export DOC_SRC=docs/docbkx DOC_GEN=docs/reference && \ xmlto -o $${DOC_GEN}/html --skip-validation xhtml \ $${DOC_SRC}/index.xml && \ xmlto -o $${DOC_GEN}/pdf --with-fop --skip-validation pdf \ $${DOC_SRC}/index.xml && \ mv $${DOC_GEN}/pdf/index.pdf $${DOC_GEN}/pdf/spring-ldap-reference.pdf ant -f debian/build.xml reference get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ uscan \ --verbose \ --no-symlink \ --destdir $(CURDIR) \ --watchfile debian/watch \ --force-download DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') MAVEN_REPO := http://repo1.maven.org/maven2 get-orig-pom: for component in core-tiger core parent; \ do \ wget -U NoAgent-1.0 -O debian/poms/spring-ldap-$${component}.pom \ $(MAVEN_REPO)/org/springframework/ldap/spring-ldap-$${component}/$(DEB_UPSTREAM_VERSION)/spring-ldap-$${component}-$(DEB_UPSTREAM_VERSION).pom ;\ done debian/libspring-ldap-java-doc.doc-base.10000644000000000000000000000040311724743746015331 0ustar Document: libspring-ldap-java-doc1 Title: API for Spring LDAP Abstract: Java library for simpler LDAP programming Section: Programming Format: HTML Index: /usr/share/doc/libspring-ldap-java/api/index.html Files: /usr/share/doc/libspring-ldap-java/api/*.html debian/watch0000644000000000000000000000036011724743746010235 0ustar version=3 opts=dversionmangle=s/\+dfsg// \ http://s3browse.springsource.com/browse/dist.springframework.org/release/LDAP/ \ http://dist.springframework.org/release/LDAP/spring-ldap-([\w\.]+)-with-dependencies\.zip debian debian/orig-tar.sh debian/maven.ignoreRules0000644000000000000000000000175411724743746012542 0ustar # Maven rules - transform Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ org.acegisecurity * * * * * easymock * * * * * junit * * * * * gsbase * * * * * jdepend * * * * * org.springframework.security * * * * * debian/libspring-ldap-java-doc.install0000644000000000000000000000023111724743746015162 0ustar build/api usr/share/doc/libspring-ldap-java build/reference usr/share/doc/libspring-ldap-java samples usr/share/doc/libspring-ldap-java debian/orig-tar.excludes0000644000000000000000000000025611724743746012472 0ustar libspring-ldap-java-*/docs/api/* libspring-ldap-java-*/docs/reference/* libspring-ldap-java-*/lib/* libspring-ldap-java-*/dist/*.jar libspring-ldap-java-*/dist/modules/*.jar debian/maven.rules0000644000000000000000000000173711724743746011377 0ustar # Maven rules - transform Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ org.springframework * * s/3\..*/3.x/ * * javax.servlet servlet-api jar s/.*/2.5/ * * log4j log4j jar s/1\.2\..*/1.2.x/ * * debian/patches/0002755000000000000000000000000011724743746010636 5ustar debian/patches/02_add_parser_definition.diff0000644000000000000000000001113611724743746016305 0ustar Author: Miguel Landaeta Subject: parser definition file was missing from source code For some reason, upstream did not include this file in the sources, so I had to fetch this from their svn repo. diff --git a/dist/module-sources/spring-ldap-core/org/springframework/ldap/core/DnParserImpl.jj b/dist/module-sources/spring-ldap-core/org/springframework/ldap/core/DnParserImpl.jj new file mode 100644 index 0000000..494539a --- /dev/null +++ b/dist/module-sources/spring-ldap-core/org/springframework/ldap/core/DnParserImpl.jj @@ -0,0 +1,154 @@ +/* + * Copyright 2005-2008 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +options { + LOOKAHEAD = 1; + CHOICE_AMBIGUITY_CHECK = 3; + OTHER_AMBIGUITY_CHECK = 3; + STATIC = false; + DEBUG_PARSER = false; + DEBUG_LOOKAHEAD = false; + DEBUG_TOKEN_MANAGER = false; + ERROR_REPORTING = true; + JAVA_UNICODE_ESCAPE = false; + UNICODE_INPUT = true; + IGNORE_CASE = false; + USER_TOKEN_MANAGER = false; + USER_CHAR_STREAM = false; + BUILD_PARSER = true; + BUILD_TOKEN_MANAGER = true; + SANITY_CHECK = true; + FORCE_LA_CHECK = true; +} + +PARSER_BEGIN(DnParserImpl) + +package org.springframework.ldap.core; + +public class DnParserImpl implements DnParser{ + +} + +PARSER_END(DnParserImpl) + +TOKEN: { <#ALPHA: ["a"-"z", "A"-"Z"] > } +TOKEN: { <#DIGIT: ["0"-"9"]> } +TOKEN: { <#STRINGCHAR: ~[",","=","+","<",">","#",";","\\","\""]> } +TOKEN: { <#STRINGENDCHAR: ~[",","=","+","<",">","#",";","\\","\""," "]> } +TOKEN: { <#SPECIAL: [",","=","\r","+","<",">","#",";"]> } +TOKEN: { <#HEXCHAR: ["0"-"9","a"-"f","A"-"F"]> } +TOKEN: { <#HEXPAIR: > } +TOKEN: { <#BACKSLASHCHAR: "\\"> } +TOKEN: { <#PAIR: ( | | | )> } +TOKEN: { <#ESCAPEDSPACE: >} +TOKEN: { <#ESCAPEDSTART: ( | )> } +TOKEN: { <#STRINGEND: ( | | )> } + + TOKEN: +{ + + | + + | + ( | | "-")*> + | + )+ ("." ()+ )* > + | + +} + + TOKEN: +{ + ( | | )+ + | + ()+ + | + ()? ( | )* + )> +} + + TOKEN: +{ + )* "=" ()*> +} + +/** + * input -> dn + * dn -> rdn ( ( "," | ";" ) rdn )* + * rdn -> attributeTypeAndValue ( "+" attributeTypeAndValue )* + * attributeTypeAndValue -> + * ( )* AttributeType SpacedEquals AttributeValue ( )* + * SpacedEquals -> + * AttributeType -> | + * AttributeValue -> + */ +void input() : +{ +} +{ + dn() +} + +DistinguishedName dn(): +{ +DistinguishedName dn = new DistinguishedName(); +LdapRdn rdn; +} +{ + ( rdn = rdn() {dn.add(0, rdn);} (("," | ";") rdn = rdn() {dn.add(0, rdn);})* ) + {return dn;} +} + +LdapRdn rdn(): +{ +LdapRdnComponent rdnComponent; +LdapRdn rdn = new LdapRdn(); +} +{ + (rdnComponent = attributeTypeAndValue() {rdn.addComponent(rdnComponent);} ("+" rdnComponent = attributeTypeAndValue() {rdn.addComponent(rdnComponent);})*) + {return rdn;} +} + +LdapRdnComponent attributeTypeAndValue(): +{ +String attributeType; +String value; +} +{ + ( ()* attributeType = AttributeType() SpacedEquals() value = AttributeValue() ()*) + {return new LdapRdnComponent(attributeType, value, true);} +} + +void SpacedEquals(): +{} +{ + {token_source.SwitchTo(SPACED_EQUALS_S);} +} + +String AttributeType(): +{Token t;} +{ + ( t = | t = ) + {return t.image.toString();} +} + +String AttributeValue(): +{Token t;} +{ + {token_source.SwitchTo(ATTRVALUE_S);} t = {token_source.SwitchTo(DEFAULT);} + {return t.image.toString();} +} \ No newline at end of file debian/patches/01_update_ldap_import.diff0000644000000000000000000000176511724743746015653 0ustar Author: Miguel Landaeta 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 debian/patches/series0000644000000000000000000000007111724743746012047 0ustar 01_update_ldap_import.diff 02_add_parser_definition.diff