This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 66782e95c798951f8035ef49f06faa45d6b396dd Author: Raphael Ouazana <[email protected]> AuthorDate: Thu Nov 7 15:34:38 2019 +0100 JAMES-2949 Update documentation and configuration accordingly --- server/app/src/main/resources/usersrepository.xml | 15 --------- .../app/src/main/resources/usersrepository23.xml | 36 ---------------------- .../src/main/resources/usersrepository23.xml | 26 ---------------- src/site/xdoc/server/config-users.xml | 24 --------------- 4 files changed, 101 deletions(-) diff --git a/server/app/src/main/resources/usersrepository.xml b/server/app/src/main/resources/usersrepository.xml index 11864fe..ff34382 100644 --- a/server/app/src/main/resources/usersrepository.xml +++ b/server/app/src/main/resources/usersrepository.xml @@ -51,18 +51,3 @@ principal="uid=ldapUser,ou=system" credentials="password" userBase="ou=People,o=myorg.com,ou=system" userIdAttribute="uid"/>; --> -<!-- The UsersRepository implementations below are DEPRECATED and will get removed in the next release --> -<!-- They are just listed here for backward-compatibility--> - -<!-- File-based user repositories Use these configurations to store user info in the filesystem --> -<!-- The LocalUsers repository, for storing James' User info. --> -<!-- DEPRECATED: This implementation will get removed in the next release --> -<!-- -<usersrepository name="LocalUsers" class="org.apache.james.user.file.UsersFileRepository"> - <destination URL="file://var/users/"/> - <ignoreCase>true</ignoreCase> - <enableAliases>true</enableAliases> - <enableForwarding>true</enableForwarding> - <enableVirtualHosting>false</enableVirtualHosting> -</usersrepository> ---> diff --git a/server/app/src/main/resources/usersrepository23.xml b/server/app/src/main/resources/usersrepository23.xml deleted file mode 100644 index 5709494..0000000 --- a/server/app/src/main/resources/usersrepository23.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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. - --> - -<!-- - This template file can be used as example for James Server configuration - DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS ---> - -<!-- See http://james.apache.org/server/3/config.html for usage --> - -<importjames23-usersrepository class="org.apache.james.user.file.UsersFileRepository"> - - <destination URL="file://var/users/" /> - <ignoreCase>true</ignoreCase> - <enableAliases>true</enableAliases> - <enableForwarding>true</enableForwarding> - <enableVirtualHosting>false</enableVirtualHosting> - -</importjames23-usersrepository> diff --git a/server/data/data-api/src/main/resources/usersrepository23.xml b/server/data/data-api/src/main/resources/usersrepository23.xml deleted file mode 100644 index 94ba99d..0000000 --- a/server/data/data-api/src/main/resources/usersrepository23.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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. - --> -<importjames23-usersrepository class="org.apache.james.user.file.UsersFileRepository"> - <destination URL="file://var/users/" /> - <ignoreCase>true</ignoreCase> - <enableAliases>true</enableAliases> - <enableForwarding>true</enableForwarding> - <enableVirtualHosting>false</enableVirtualHosting> -</importjames23-usersrepository> diff --git a/src/site/xdoc/server/config-users.xml b/src/site/xdoc/server/config-users.xml index 32e9659..11fe61d 100644 --- a/src/site/xdoc/server/config-users.xml +++ b/src/site/xdoc/server/config-users.xml @@ -66,30 +66,6 @@ </subsection> - <subsection name="File Users Repository"> - - <p>The File UsersRepository implementations below are DEPRECATED and will get removed in the next release</p> - <p>It just listed here for backward-compatibility</p> - - <p>File-based user repositories Use these configurations to store user info in the filesystem.</p> - - <p>The usersrepository tag as 2 attributes:name="LocalUsers" class="org.apache.james.user.file.UsersFileRepository"></p> - - <dl> - <dt><strong>destination</strong></dt> - <dd>Example: file://var/users/.</dd> - <dt><strong>ignoreCase</strong></dt> - <dd>true or false.</dd> - <dt><strong>enableAliases</strong></dt> - <dd>true or false.</dd> - <dt><strong>enableForwarding</strong></dt> - <dd>true or false.</dd> - <dt><strong>enableVirtualHosting</strong></dt> - <dd>true (default) or false. Defines if the usernames must (true) or may not contain (false) a domain part ([email protected]).</dd> - </dl> - - </subsection> - <subsection name="LDAP Users Repository"> <p>Read-Only LDAP based UsersRepository</p> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
