Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master->main

Browse Source 
Closes gh-580
This commit is contained in:
Rob Winch
2021-04-26 16:17:54 -05:00
parent e27bd78395
commit cef377b050
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@@ -37,10 +37,10 @@ If you have not previously done so, please fill out and
submit the [Contributor License Agreement](https://cla.pivotal.io/sign/spring).
## Create your branch from `master`
## Create your branch from `main`
If your pull request addresses a bug or improvement, please create your branch
from Spring LDAP's `master` branch. Rest assured that if your pull
from Spring LDAP's `main` branch. Rest assured that if your pull
request is accepted, these changes will also eventually
be merged into any other branches we feel appropriate.

2
core/src/itest-openldap/java/conf/ldap.conf
View File

@@ -6,7 +6,7 @@
# This file should be world readable but not world writable.
#BASE dc=example, dc=com
#URI ldap://ldap.example.com ldap://ldap-master.example.com:666
#URI ldap://ldap.example.com ldap://ldap-main.example.com:666
#SIZELIMIT 12
#TIMELIMIT 15

12
core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
View File

@@ -206,13 +206,13 @@ public class DirContextAdapter implements DirContextOperations {
/**
* Constructor for cloning an existing adapter.
*
* @param master The adapter to be copied.
* @param main The adapter to be copied.
*/
protected DirContextAdapter(DirContextAdapter master) {
this.originalAttrs = (NameAwareAttributes) master.originalAttrs.clone();
this.dn = master.dn;
this.updatedAttrs = (NameAwareAttributes) master.updatedAttrs.clone();
this.updateMode = master.updateMode;
protected DirContextAdapter(DirContextAdapter main) {
this.originalAttrs = (NameAwareAttributes) main.originalAttrs.clone();
this.dn = main.dn;
this.updatedAttrs = (NameAwareAttributes) main.updatedAttrs.clone();
this.updateMode = main.updateMode;
}
/**

2
readme.md
View File

@@ -2,7 +2,7 @@
[![Join the chat at https://gitter.im/spring-projects/spring-ldap](https://badges.gitter.im/spring-projects/spring-ldap.svg)](https://gitter.im/spring-projects/spring-ldap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://travis-ci.org/spring-projects/spring-ldap.svg?branch=master)](https://travis-ci.org/spring-projects/spring-ldap)
[![Build Status](https://travis-ci.org/spring-projects/spring-ldap.svg?branch=main)](https://travis-ci.org/spring-projects/spring-ldap)
## Code of Conduct
This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.adoc).

6
src/docs/asciidoc/index.adoc
View File

@@ -230,8 +230,8 @@ The following list briefly describes the most important changes in Spring LDAP 2
* Fluent LDAP query building support has been added. This makes for a more pleasant programming experience when working with LDAP searches in Spring LDAP.
See <<basic-queries>> and <<query-builder-advanced>> for more information about the LDAP query builder support.
* The old `authenticate` methods in `LdapTemplate` have been deprecated in favor of a couple of new `authenticate` methods that work with `LdapQuery` objects and _throw exceptions_ on authentication failure, making it easier for the user to find out what caused an authentication attempt to fail.
* The https://github.com/spring-projects/spring-ldap/tree/master/samples[samples] have been polished and updated to make use of the features in 2.0.
Quite a bit of effort has been put into providing a useful example of an https://github.com/spring-projects/spring-ldap/tree/master/samples/user-admin[LDAP user management application].
* The https://github.com/spring-projects/spring-ldap/tree/main/samples[samples] have been polished and updated to make use of the features in 2.0.
Quite a bit of effort has been put into providing a useful example of an https://github.com/spring-projects/spring-ldap/tree/main/samples/user-admin[LDAP user management application].
[[spring-ldap-packaging-overview]]
=== Packaging Overview
@@ -255,7 +255,7 @@ In addition to the required dependencies, the following optional dependencies ar
[[spring-ldap-getting-started]]
=== Getting Started
The https://github.com/spring-projects/spring-ldap/tree/master/samples[samples] provide some useful examples of how to use Spring LDAP for common use cases.
The https://github.com/spring-projects/spring-ldap/tree/main/samples[samples] provide some useful examples of how to use Spring LDAP for common use cases.
[[spring-ldap-support]]
=== Support