mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-22 15:12:38 +00:00
Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115426 adavis: ACE-4520: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
<< All the MNT-13871 commits at the end of phase 2 testing of 4.2.5 >>
111899: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
111834: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111589: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
111531: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added small changes required for compilation of authorization module.,
111901: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
111836: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111765: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
111600: Merged V4.1-BUG-FIX (4.1.11) to PATCHES/V4.2.5 (4.2.5)
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Extra changes that are required to make authorization module build green.,
112553: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112540: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
112447: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added configuration required to compile authorised-users module.,
113101: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112930: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
112707 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
112677 dvaserin: MNT-14780 (MNT-13871): Licence Error message when in overage
- Place overage buffer information into License MBean and use it in admin license ftl.
112634 adavis: MNT-13871: Merged DEV (V4.2.5-MNT-13871-LATEST) to V4.2.5 (4.2.5)
111550: Merged DEV (4.1.11) to DEV (4.2.5)
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Merged all made changes in core alfresco projects as single commit to fresh dev branch forked from V4.1-BUG-FIX.
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- added try/finally approach to reset show delete users flag to default value.,
111574: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added V4.2.5 specific changes.,
111582: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Updated the jar to correspond with the latest changes in authorised-users/4.2,
111751: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Removed unnecessary configuration.,
111752: Merged DEV (V4.1.11) to DEV (V4.2.5)
111632: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Fixed unit tests for build plan: https://bamboo.alfresco.com/bamboo/browse/DEV-ENT414-1,
111753: Merged DEV (4.1.11) to DEV (V4.2.5)
111719: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Updated authorization related icons with ones provided by Mark Howarth.
- Information message in Deauthorize Dialog was changed to the on provided by Mark Howarth.,
111754: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Updated to the latest authorised-users lib.,
111761: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Fix for the SchemaReferenceFileTest.,
111800: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Modified the test to create a tenant in a retrying transaction to solve the DataIntegrityViolationException.,
111801: Megred DEV (4.1.11) to DEV (4.2.5)
111795: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Updated Deleted column to display text instead of tick icon.
- Added name for actions column.,
111813: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Updated to the latest authorisation jar to fix the Scema Reference test.,
112020: MNT-14775: De-authorisation pop-up has similar title to first line of text
- Remove the duplicated text from the pop-up body
- Updated link to point the 4.2 documentation,
112134: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
- Update authorization jar,
112144: MNT-13871: Optimized strings in users.get.properties,
112184: MNT-14762 : [UserAuth]Users from the ALFRESCO_ADMINISTRATORS LDAP group are not pre-authorized
- Updated authorized-users jar with fix for ldap administrators pre-authorization.,
112196: MNT-14729 : [UserAuth] The column header for the Deauthorize and Reauthorize button should have a name
- Updated name for re/de-authorize actions column.,
112202: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
- Add new authorization jar to fix null errors,
112203: MNT-14779: System behaviour when system set read only due to licence exception
- Force read-write transaction for LoginPost script.,
112225: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
- Add new authorization jar after unit test fixing.,
112226: MNT-14740 : [UserAuth] The message for the failed re authorization is not displayed onIE
- Code for reloading page was wrapped with YAHOO.lang.later() function.,
112247: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
- Updated authorization jar with fix for kerberos unit test.,
112259: MNT-14776: Heading banner text when using all allowed authorised users.
- Changed the message.
- Updated the authorised-users jar.,
112269: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Wrap methods that uses 'authenticationComponent.setCurrentUser' into RetryingTransaction for retrying on DataIntegrityViolationException.,
112285: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
- Updated version for authorized-users jar.,
112388: MNT-14809: [UserAuth] On a cluster setup after running the hourly job only one node goes into R/O mode
- Updated the authorised-users.jar,
112439: MNT-14815 : Wrong documentation link used in the deauthorize message window
- Corrected link to documentation.,
112445: MNT-14818 : [UserAuth] Missing quotation mark in the user reauthorization window message
- Corrected message for reauthorization dialog.,
112450: MNT-14802: [UserAuth] License warning message displayed for all the users
- Updated the authorised-users jar.,
112454: MNT-14780: Licence Error message when in overage
- Make license warn messages on admin console the same as banner warn messages.,
112471: MNT-14773 : Sort state not persisted after authorisation action
- Sorting/paging state is now persists in sessionStorage.,
112478: MNT-14773 : Sort state not persisted after authorisation action
- Corrected previous fix.,
112483: MNT-14814: [UserAuth] System goes into R/O mode after running the hourly job
- Updated the authorised-users jar to the latest version.,
112512: MNT-14833: [UserAuth] User cannot login on both nodes (cluster env.)
- Update authorization jar.,
112556: MNT-14787: [UserAuth] Login via NFS works when the license limit exceed
- Modified the exception handling of setCurrentUser method. Now all the exceptions are rethrown.,
112570: MNT-14838: Correct the Max Users string in the Admin Console License Screen
- Corrected the string, remove the incorrect translations from the bundle.,
112572: REVERSE MERGED <<code is not worth to implement>>
112471 : MNT-14773 : Sort state not persisted after authorisation action
- Sorting/paging state is now persists in sessionStorage.
112478 : MNT-14773 : Sort state not persisted after authorisation action
- Corrected previous fix. ,
112610: MNT-14837 : Report license overage to the log files on authorization/deauthorization of users
- Updated users authorization jar file.,
112627: MNT-14839: [UserAuth]Alfresco goes in read -only after reauthorize a user from LDAP ALFESCO_ADMINISTRATORS group
- Updated the authorised-users jar to the latest version.
Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
111954: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Removed context reference to authorization.,
112003: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added copying of sources and configuration from authorised-users to the output directory during build.,
112014: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Modified the build configuration to unpack the resources to the test folders.,
112027: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added unpacking of authorisation resources to repoitory-crypto project.,
112067: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Removed unpacking of resources, changed the context imports to point to authorization.,
112952: Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
111887: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Corrected the authorised-users version to correspond to 5.0.,
113060: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113059 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113058 adavis: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Version dependency for alfresco-authorised-users moved to top level pom,
113103: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113036 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113030 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113019 amukha: MNT-14862 MNT-13871: [UserAuth] Login via FTP works when the license limit exceed
- Corrected the AlfrescoFtpAuthenticator to rollback teh transaction if an exception was thrown.,
113215: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113213 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
113209 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113124: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
- Added the scripts to the main code base.
- Updated the authorised-users.jar,
113203: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
- Moved the patch to the main code.
- Updated the authorised-users.jar
113128: MNT-14867 (MNT-13871) : [UserAuth] License user limit exceeded by adding users to ALFRESCO_ADMINISTRATORS LDAP group
- Updated auhtorised-users jar.,,
113246: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Try to fix one of the two build errors on 5.1.N as a result of r113101,
113578: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
- Fixed the test SiteServiceImplTest.testGroupMembership ,
113647: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
- Fixed the test SiteServiceImplTest.testListSiteMemberships that failed after testGroupMembership was fixed, but didn't delete the created site.,
113935: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113924 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113914 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113903 gbroadbent: GERMAN: Updated bundle based on EN-rev112938,
113936: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113925 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113915 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113904 gbroadbent: SPANISH: Updated bundle based on EN-rev112938,
113937: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113926 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113916 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113905 gbroadbent: FRENCH: Updated bundle based on EN-rev112938,
113939: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113927 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113917 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113906 gbroadbent: ITALIAN: Updated bundle based on EN-rev112938,
113940: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113928 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113918 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113907 gbroadbent: JAPANESE: Updated bundle based on EN-rev112938,
113941: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113929 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113919 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113908 gbroadbent: NORWEGIAN Bokmal: Updated bundle based on EN-rev112938,
113942: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113930 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113920 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113909 gbroadbent: DUCTH: Updated bundle based on EN-rev112938,
113943: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113931 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113921 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113910 gbroadbent: BRAZILIAN PORTUGUESE: Updated bundle based on EN-rev112938,
113944: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113932 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113922 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113911 gbroadbent: SIMPLIFIED Chinese: Updated bundle based on EN-rev112938,
113945: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
113933 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113923 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
113912 gbroadbent: RUSSIAN: Updated bundle based on EN-rev112938,
114046: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
- Removed the hardcoded value in the test.,
114589: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114485 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114335 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
114334 amukha: MNT-14984 MNT-13871: Modification to the User Authentication Warning wording.
- Changed the warning message.,
114828: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114749 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114703 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114574 gbroadbent: GERMAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114829: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114750 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114704 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114575 gbroadbent: SPANISH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114830: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114751 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114705 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114576 gbroadbent: FRENCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114831: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114752 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114706 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114577 gbroadbent: ITALIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114832: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114753 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114708 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114578 gbroadbent: JAPANESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114833: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114754 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114709 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114579 gbroadbent: DUTCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114834: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114755 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114710 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114580 gbroadbent: RUSSIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114835: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114756 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114711 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114593 gbroadbent: SIMP CHINESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
114836: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
114757 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
114712 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
114594 gbroadbent: NORWEGIAN Bokmal: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
@@ -1,24 +1,25 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.alfresco.filesys.auth.ftp;
|
||||
|
||||
import javax.transaction.Status;
|
||||
import javax.transaction.SystemException;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import org.alfresco.filesys.alfresco.AlfrescoClientInfo;
|
||||
@@ -117,6 +118,17 @@ public class AlfrescoFtpAuthenticator extends FTPAuthenticatorBase {
|
||||
{
|
||||
if ( logger.isDebugEnabled())
|
||||
logger.debug( ex);
|
||||
try
|
||||
{
|
||||
tx.setRollbackOnly();
|
||||
}
|
||||
catch (SystemException e)
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
||||
@@ -372,6 +372,7 @@ public class AlfrescoRpcAuthenticator implements RpcAuthenticator, InitializingB
|
||||
{
|
||||
if ( logger.isErrorEnabled())
|
||||
logger.error( "Error in RPC authenticator setting current user", ex);
|
||||
throw ex;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ public class People extends BaseScopableProcessorExtension implements Initializi
|
||||
private int defaultListMaxResults = 5000;
|
||||
private boolean honorHintUseCQ = true;
|
||||
|
||||
private static final String HINT_CQ_SUFFIX = " [hint:useCQ]";
|
||||
protected static final String HINT_CQ_SUFFIX = " [hint:useCQ]";
|
||||
|
||||
public void afterPropertiesSet() throws Exception
|
||||
{
|
||||
@@ -165,11 +165,11 @@ public class People extends BaseScopableProcessorExtension implements Initializi
|
||||
/**
|
||||
* Set the service registry
|
||||
*
|
||||
* @param serviceRegistry the service registry
|
||||
* @param serviceRegistry the service registry
|
||||
*/
|
||||
public void setServiceRegistry(ServiceRegistry serviceRegistry)
|
||||
{
|
||||
this.services = serviceRegistry;
|
||||
this.services = serviceRegistry;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -311,8 +311,8 @@ public class People extends BaseScopableProcessorExtension implements Initializi
|
||||
public ScriptNode createPerson(String userName, String firstName, String lastName, String emailAddress,
|
||||
String password, boolean setAccountEnabled, boolean notifyByEmail)
|
||||
{
|
||||
ParameterCheck.mandatory("firstName", firstName);
|
||||
ParameterCheck.mandatory("emailAddress", emailAddress);
|
||||
ParameterCheck.mandatory("firstName", firstName);
|
||||
ParameterCheck.mandatory("emailAddress", emailAddress);
|
||||
|
||||
ScriptNode person = null;
|
||||
|
||||
@@ -321,13 +321,13 @@ public class People extends BaseScopableProcessorExtension implements Initializi
|
||||
{
|
||||
for (int i=0; i < numRetries; i++)
|
||||
{
|
||||
userName = usernameGenerator.generateUserName(firstName, lastName, emailAddress, i);
|
||||
|
||||
// create person if user name does not already exist
|
||||
if (!personService.personExists(userName))
|
||||
{
|
||||
break;
|
||||
}
|
||||
userName = usernameGenerator.generateUserName(firstName, lastName, emailAddress, i);
|
||||
|
||||
// create person if user name does not already exist
|
||||
if (!personService.personExists(userName))
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -344,19 +344,19 @@ public class People extends BaseScopableProcessorExtension implements Initializi
|
||||
|
||||
person = createPerson(userName, firstName, lastName, emailAddress);
|
||||
|
||||
if (person != null && password != null)
|
||||
{
|
||||
// create account for person with the userName and password
|
||||
authenticationService.createAuthentication(userName, password.toCharArray());
|
||||
authenticationService.setAuthenticationEnabled(userName, setAccountEnabled);
|
||||
|
||||
person.save();
|
||||
|
||||
if(notifyByEmail)
|
||||
{
|
||||
personService.notifyPerson(userName, password);
|
||||
}
|
||||
}
|
||||
if (person != null && password != null)
|
||||
{
|
||||
// create account for person with the userName and password
|
||||
authenticationService.createAuthentication(userName, password.toCharArray());
|
||||
authenticationService.setAuthenticationEnabled(userName, setAccountEnabled);
|
||||
|
||||
person.save();
|
||||
|
||||
if(notifyByEmail)
|
||||
{
|
||||
personService.notifyPerson(userName, password);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return person;
|
||||
@@ -914,8 +914,8 @@ public class People extends BaseScopableProcessorExtension implements Initializi
|
||||
|
||||
if ("fullName".equalsIgnoreCase(sortBy))
|
||||
{
|
||||
String firstName = nodeService.getProperty(nodeRef, ContentModel.PROP_FIRSTNAME).toString();
|
||||
String lastName = nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME).toString();
|
||||
String firstName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_FIRSTNAME);
|
||||
String lastName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME);
|
||||
String fullName = firstName;
|
||||
if (lastName != null && lastName.length() > 0)
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2013 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2015 Alfresco Software Limited.
|
||||
*
|
||||
* This file is part of Alfresco
|
||||
*
|
||||
@@ -55,7 +55,6 @@ import org.alfresco.repo.policy.PolicyComponent;
|
||||
import org.alfresco.repo.search.SearcherException;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationException;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||
import org.alfresco.repo.security.permissions.PermissionServiceSPI;
|
||||
import org.alfresco.repo.tenant.TenantDomainMismatchException;
|
||||
import org.alfresco.repo.tenant.TenantService;
|
||||
@@ -69,8 +68,6 @@ import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.action.Action;
|
||||
import org.alfresco.service.cmr.action.ActionService;
|
||||
import org.alfresco.service.cmr.admin.RepoAdminService;
|
||||
import org.alfresco.service.cmr.admin.RepoUsage.UsageType;
|
||||
import org.alfresco.service.cmr.admin.RepoUsageStatus;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.invitation.InvitationException;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
@@ -124,7 +121,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
private static final String LEAVE = "LEAVE";
|
||||
public static final String SYSTEM_FOLDER_SHORT_QNAME = "sys:system";
|
||||
public static final String PEOPLE_FOLDER_SHORT_QNAME = "sys:people";
|
||||
private static final String SYSTEM_USAGE_WARN_LIMIT_USERS_EXCEEDED_VERBOSE = "system.usage.err.limit_users_exceeded_verbose";
|
||||
|
||||
private static final String KEY_POST_TXN_DUPLICATES = "PersonServiceImpl.KEY_POST_TXN_DUPLICATES";
|
||||
public static final String KEY_ALLOW_UID_UPDATE = "PersonServiceImpl.KEY_ALLOW_UID_UPDATE";
|
||||
@@ -952,18 +948,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
throw new IllegalArgumentException("No username specified when creating the person.");
|
||||
}
|
||||
|
||||
/*
|
||||
* Check restrictions on the number of users
|
||||
*/
|
||||
Long maxUsers = repoAdminService.getRestrictions().getUsers();
|
||||
if (maxUsers != null)
|
||||
{
|
||||
// Get the set of users created in this transaction
|
||||
Set<String> usersCreated = TransactionalResourceHelper.getSet(KEY_USERS_CREATED);
|
||||
usersCreated.add(userName);
|
||||
AlfrescoTransactionSupport.bindListener(this);
|
||||
}
|
||||
|
||||
AuthorityType authorityType = AuthorityType.getAuthorityType(userName);
|
||||
if (authorityType != AuthorityType.USER)
|
||||
{
|
||||
@@ -1258,16 +1242,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
beforeDeleteNodeValidationBehaviour.enable();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Kick off the transaction listener for create user. It has the side-effect of
|
||||
* recalculating the number of users.
|
||||
*/
|
||||
Long maxUsers = repoAdminService.getRestrictions().getUsers();
|
||||
if (maxUsers != null)
|
||||
{
|
||||
AlfrescoTransactionSupport.bindListener(this);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2093,72 +2067,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
|
||||
AlfrescoTransactionSupport.bindListener(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public void beforeCommit(boolean readOnly)
|
||||
{
|
||||
// check whether max users has been exceeded
|
||||
RunAsWork<Long> getMaxUsersWork = new RunAsWork<Long>()
|
||||
{
|
||||
@Override
|
||||
public Long doWork() throws Exception
|
||||
{
|
||||
return repoAdminService.getRestrictions().getUsers();
|
||||
}
|
||||
};
|
||||
Long maxUsers = AuthenticationUtil.runAs(getMaxUsersWork, AuthenticationUtil.getSystemUserName());
|
||||
if(maxUsers == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Long users = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Long>()
|
||||
{
|
||||
public Long doWork() throws Exception
|
||||
{
|
||||
repoAdminService.updateUsage(UsageType.USAGE_USERS);
|
||||
if(logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("Number of users is " + repoAdminService.getUsage().getUsers());
|
||||
}
|
||||
return repoAdminService.getUsage().getUsers();
|
||||
}
|
||||
} , AuthenticationUtil.getSystemUserName());
|
||||
|
||||
// Get the set of users created in this transaction
|
||||
Set<String> usersCreated = TransactionalResourceHelper.getSet(KEY_USERS_CREATED);
|
||||
|
||||
// If we exceed the limit, generate decent message about which users were being created, etc.
|
||||
if (users > maxUsers)
|
||||
{
|
||||
List<String> usersMsg = new ArrayList<String>(5);
|
||||
int i = 0;
|
||||
for (String userCreated : usersCreated)
|
||||
{
|
||||
i++;
|
||||
if (i > 5)
|
||||
{
|
||||
usersMsg.add(" ... more");
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
usersMsg.add(userCreated);
|
||||
}
|
||||
}
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("Maximum number of users exceeded: " + usersCreated);
|
||||
}
|
||||
throw AlfrescoRuntimeException.create(SYSTEM_USAGE_WARN_LIMIT_USERS_EXCEEDED_VERBOSE, maxUsers, usersMsg);
|
||||
}
|
||||
|
||||
// Get the usages and log any warnings
|
||||
RepoUsageStatus usageStatus = repoAdminService.getUsageStatus();
|
||||
usageStatus.logMessages(logger);
|
||||
}
|
||||
|
||||
public int countPeople()
|
||||
{
|
||||
NodeRef peopleContainer = getPeopleContainer();
|
||||
|
||||
Reference in New Issue
Block a user