inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,538 Commits 339 Branches 2,245 Tags
76cbb2f8ffaaf380cd7a697de42d031f99c019cd
Commit Graph

23 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:48:49 +00:00
Alan Davis
1bf5fb2b73 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
 2015-10-30 00:09:37 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-03-27 23:00:01 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders) 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-08-20 17:17:31 +00:00
Derek Hulley
e118211bd3 Merged DEV/SWIFT to HEAD (FTP Tests, Tika and Poi) 
26059: ALF-5900 - IMAP creates winmail.dat in attachment folder (Add support for Microsoft Transport Neutral Encapsulation Format.)
          - added attachment extraction for TNEF documents - goodbye winmail.dat !
   26063: javadoc for imap.
   26088: ALF-7408 - addition of commons-net for ftp client library.
          First test of end to end ftp.   Just a simple test of connection now, will be followed by more detailed tests.
   26176: ALF-7408 - FTP tests + disabled failing test case for ALF-7618
   26180: ALF-7618 - correction of unit test error.
   26188: ALF-7618 - added a test of paths
   26229: Added back simple '\~.*' pattern
   26288: ALF-7676 - Test to stress different user rights.
          - FTPServerTest.testTwoUserUpdate added for the FTP server.
   26304: Corrected spelling name in private class.
   26408: addming minimal package infos.
   26416: ALF-5082 / ALF-2183 / ALF-4448 - When guessing the mimetype for a file, add the option to supply a ContentReader to enhance the accuracy.
          Enable this for a few key places that do mimetype guessing,
          which should avoid issues for files with the wrong extension (either renamed accidently, or for .TMP)
   26433: Re-order the mimetype guess step to ensure that the Content Reader is always valid
   26440: Added another test for word 2003 save as.
   26441: Test resource for ContentDiskDriver
   26446: ALF-5082 - Back out a FileFolderService change to mimetype guessing, which had broken things, pending a better way to do it with ContentWriter
   26490: Small change for ContentDiskDriverTes.fileExists.  Leaky transaction causing problems in automated build.
   26497: ContentDiskDriver - commented out two of the problematic leaky transaction tests.
   26503: Add new interface methods + documentation for asking a ContentWriter to guess the mimetype and encoding for you.
          (Code will be migrated from places that currently do this themselves later)
   26504: Add an extension interface in the DataModel project for some of the extra ContentReader methods that FileContentReader provides
   26505: When ContentWriter.putContent(String) is called with no encoding specified, record what the system default encoding was that was used.
          (Prevents issues if the system default is ever changed)
   26509: When calling Tika to do file detection, if we have a file based reader then give Tika the File rather than an InputStream
   26522: More debug logging while debugging ALF-5260
   26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly).
   26522: More debug logging while diagnosing ALF-5260
   26548: Add another mimetype check - ensures that truncated/corrup container files which can't be fully processed can still get the container type without failure
   26549: Implement the mimetype and encoding guessers on ContentWriter (either immediately or as a listener, as required), and update FileFolderServer to make use of this (+test this)
   26553: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26554: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26579: Switch the transformer to use Tika

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-06-07 07:36:37 +00:00
Dave Ward
9963da3d51 Merged V3.3 to HEAD 
20794: Merged DEV/V3.3-BUG-FIX to V3.3
      20792: Fix for unit test failures introduced by check in 20771
      20791: ALF-3568: Include axiom jars in WAS shared library to solve Quickr connector issues
      20785: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_06_14 to DEV/V3.3-BUG-FIX
         20644: Function for the browser window closing was implemented. For IE browser the trick with window opener was used. Fixes ALF-1004: After closing Details Space, user doesn't return to his previous location
      20784: Fix for ALF-3516: Enterprise 3.X / Impossible to Create a Blog with Special Characters in the Title (?/!)
      20783: Fix for ALF-1087: Documents checked-out from Share do not have "Upload new version" action in Alfresco Explorer
      20782: Added multiday timed event handling to week view
      20775: Merged V3.3 to DEV/V3.3-BUG-FIX
         20670: Fix for ALF-3260: XSS attack is made in Wiki tab if First/Last user name contain xss. Also fixed double encoding errors found during regression testing.
      20772: Update to node browser to show namespace of attributes.
      20771: ALF-3591 - transferring rules.
         - also extends the behaviour filter.
      20770: ALF-3186 - action parameter values are not fully transferred - need to handle d:any
      20768: AVM - ALF-3611 (OrphanReaper + PurgeTestP + additional NPE fixes)
      20765: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20708: DB2 build - add create/drop db ant targets (use DB2 cmdline - since not possible via JDBC/SQL)
         20722: DB2 build - run db2cmd in same window (follow-on to r20708)
      20764: Fix unreported JSON encoding issue with links components
      20762: Fix ALF-2599: Share - Cannot search for user currently logged on
      20759: DB2: fix FullNodeServiceTest.testLongMLTextValues (ALF-497)
         - TODO: fix create script when merging to HEAD
      20756: DB2: fix JBPMEngine*Test.* (ALF-3640) - follow-on (upgrade patch)
      20746: DB2: fix WebProjectServiceImplTest.testCreateWebProject (ALF-2300)
      20744: DB2: fix JBPMEngine*Test.* (ALF-3640) - missed file
      20743: DB2: fix JBPMEngine*Test.* (ALF-3640)
      20729: AVM - fix purge store so that root nodes are actually orphaned (ALF-3627)
         - also prelim for ALF-3611
      20720: (RECORD ONLY) ALF-3594: Merged HEAD to V3.3-BUGFIX
         20616: ALF-2265: Share 'Uber Filter' part 2
            - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter
            - Now the filter simply chains to the downstream authentication filter rather than call its superclass
            - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM
            - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml
            - Configured webscriptAuthenticationFilter for Kerberos subsystem
      20719: Merged DEV/TEMPORARY to V3.3-BUGFIX
         20696: ALF-3180: when using NTLM SSO, a user needs to log in first into the web UI before being able to mount alfresco using CIFS
            The absence of the missing person creation logic in “the org.alfresco.filesys.auth.cifs.PassthruCifsAuthenticator.authenticateUser()” method was fixed. 
      20718: Merged DEV/TEMPORARY to V3.3-BUGFIX
         20659: ALF-3216: Incomplete settings for Lotus Quickr
            The protocol,host,port and context are removed from properties and a dependency on the org.alfresco.repo.admin.SysAdminParams interface is introduced.
      20711: Latest SpringSurf libs - fix for ALF-3557
      20710: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
         20705: Fix ALF-3585: AtomPub summary can render first part of binary content resulting in invalid XML
      20691: Merged DEV/TEMPORARY to V3.3-BUGFIX
         19404: ALF-220: Editor can't rename files and folders via WebDav
            The Rename method of FileFolderService was used in case of file renaming instead of move method in WebDAV MOVE command.
      20663: ALF-3208 RenderingEngine actions should no longer appear in the list of available actions that can be fired using rules.
      20656: ALF-2645: LDAP sync now logs 'dangling references' for debugging purposes
      20651: ALF-485: FTP passthru authenticator logs authentication failures at debug level to avoid noise in the logs
      20646: Merge V2.2 To V3.3
         14301 : RECORD ONLY - ETWOTWO-1227 - fix to serialize FSR deployments.
         14618 : RECORD ONLY - Merge HEAD to 2.2 13944 : After rename project deploy option disappears.
      20637: ALF-3123: Avoid NPE on Oracle when loading empty string values persisted through JMX and the attribute service
      20633: ALF-2057: LDAP synchronization lock now persists for a maximum of two minutes (instead of 24 hours!)
         - The exclusive lock gained for LDAP sync from the JobLockService is now refreshed at 1 minute intervals and never persists for more than 2 minutes
      20628: ALF-1905: Allow use of anonymous bind for LDAP synchronization (NOT authentication)
         - Previously synchronization AND authentication shared the same setting for java.naming.security.authentication, meaning that if you tried to use anonymous bind for the synchronization side, the authentication side would complain.
         - Now there are two independent environments declared for the 'default' synchronization connection and the authentication connection
         - A new property ldap.synchronization.java.naming.security.authentication declares the authentication type used by synchronization. Set to "none" for anonymous bind.
      20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
      20620: Merge DEV to V3.3-BUG-FIX
         20456 -  ALF-1824 : Setting alfresco.rmi.services.host on linux does not use specified host/IP
      20617: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3-BUG-FIX (with corrections)
         20606: ALF-651: Web Services client ContentUtils.convertToByteArray is broken
            - org.alfresco.webservice.util.ContentUtils.convertToByteArray() method has been updated to cover large Input Streams conversion.
            - org.alfresco.webservice.test.ContentUtilsTest is a test for the new functionality implemented in the ContentUtils class.
            - org.alfresco.webservice.test.resources.big-content.pdf is a large content for the ContentUtilsTest.testInputStreamToByteArrayConversion() test.
      20613: Fixed ALF-1746: Metadata extractors are unable to remove ALL aspect-related properties
         - putRawValue keeps hold of 'null' values
         - All policies keep hold of 'null' values
         - Only affects 'carryAspectProperties=false'
      20609: Merged HEAD to V3.3-BUG-FIX
         20578: ALF-3178 - Transfer Service - to transfer rule (ie. ruleFolder with it's children) the PathHelper should allow "-" (dash character)
         20608: ALF-3178 - fix r20578 (mis-applied patch)
      20594: WebDAV BitKinex compatibility fix - Let the XML Parser work out the body encoding if it is not declared in the Content-Type header
      20588: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
         - Merged across all differences from V3.3
   20778: Added revision to version label.
   20777: Fix for ALF-2451 - installer correctly configure Share port
   20722: DB2 build - run db2cmd in same window (follow-on to r20712)
   20721: DB2 build - fix create target and add "/c" to exit "db2cmd"
      - TODO: add wait/timeout target, ideally checking for created DB 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2010-06-24 15:47:38 +00:00
Dave Ward
a289049b41 Merged V2.2 to HEAD 
19977: (RECORD ONLY) Merged PATCHES/V2.2.7 to V2.2
      19778: (RECORD ONLY) Incremented version label
   19976: Merged PATCHES/V2.2.7 to V2.2
      19776: ALF-2011: Audit doesn't take into account CIFS authentication
         - Now that we've backported the ticket granting auditing, converted the Alfresco CIFS authenticators to use ticket-based authentication, rather than directly manipulating ACEGI
         - Needs thorough testing with password, NTLM, Passthru and Kerberos
      19891: ALF-2011: Audit doesn't take into account CIFS authentication
         Since each child of the CifsAuthenticator is not a Spring configured bean it has no Transaction interceptor. The Transaction wrapping functionality was added into the CifsAuthenticator.setCurrentUser() to fix a Transaction Synchronization issue after successful authentication of the user.
         Several little corrections added into the InMemoryTicketComponentImpl to allow "Null user". "Missing ticket for null" exceptions will be thrown instead of the NullPointerException
      19903: ALF-2011: Minor cleanup/formatting only
   19975: (RECORD ONLY) Merged PATCHES/V2.2.7 to V2.2
      19769: ALF-2011: Backported dependencies
         ALF-2360: Merged V3.1 to PATCHES/V2.2.7
            17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
               - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
         ALF-2361: Merged V3.2 to PATCHES/V2.2.7
            17456: Fix for: ETHREEOH-1465: It's impossible to get the login history for a given user (Audit)
               - all authentication routes (SSO and password) can now audit getting a new ticket for a session. SSO does not authenticate via the alfresco AuthenticationService API
               - you can now use auditing to track new sessions for users.
   19834: (RECORD ONLY) Increment version (from 2.2.7 to 2.2.8)
   19833: (RECORD ONLY) Merged PATCHES/V2.2.7 to BRANCHES/V2.2:
      19832: Merged BRANCHES/V3.1 to PATCHES/V2.2.7:
           17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page
   19578: (RECORD ONLY) Merged V3.0 to V2.2
      19574: Merged V3.1 to V3.0
         19573: Merged V3.2 to V3.1
            19539: Merged HEAD to V3.2
               19538: Build fix - fix build speed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2010-04-27 14:14:48 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2010-03-01 22:09:17 +00:00
Kevin Roast
b726c4d6db Merged DEV/TEMPORARY to HEAD 
17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-12-14 13:41:05 +00:00
Dave Ward
d2180c5eaa Refactor subsystems for authentication chaining 
- An authentication chain of size 1 configured by default
- DefaultChildApplicationContextManager supports dynamic configuration of the authentication chain via Spring or JMX. Any number of instances of any type allowed in chain.
- SubsystemChainingAuthenticationComponent and SubsystemChainingAuthenticationService iterate across configured chain for Authentication
- SSO (NTLM / Kerberos) and CIFS authentication independently activatable for any component in chain (where supported).
- SubsystemChainingProxyFactory used to proxy directly to first active CIFS authenticator or SSO filter in the chain
- CIFS server knows not to bother starting if authentication chain doesn't have an active CIFS authenticator (e.g. LDAP only)
- Rationalization of subsystem configuration folder structure and JMX object naming
- Classpath based extension mechanism for community edition - alfresco/extension/subsystems/<category>/<typeName>/<id>/*.properties in classpath can be used to configure specific subsystem instances
- Simplification of JMX infrastructure. No longer Spring bean definition based, thus allowing dynamic creation/registration of new instances at runtime.
- New AuthenticationChainTest unit test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-04-21 13:29:08 +00:00
Dave Ward
e28632de9e Fixes to subsystems for clean shutdown 
- FTPConfigSection / CIFSConfigSection now aware of whether they constructed the authenticator themselves
- AbstractTriggerBean doesn't try to unschedule a trigger if the scheduler is already shut down
- RuntimeExecBootstrapBean can cope with running in a subsystem and shutting down without the VM shutting down
- DefaultManagedApplicationContextFactory will start up the application context it is proxying to if it has not already been started

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-04-06 11:42:03 +00:00
Dave Ward
1f78e6b28c Align Alfresco, CIFS and FTP authentication stacks for NTLM passthru, kerberos and LDAP 
- PassthruServerFactory created to allows PassthruServers singleton to be shared by CIFS, FTP and Alfresco passthru authenticators
- Also added NTLM + Alfresco (non-passthru) example. Doesn't seem to work yet!
- ExtendedServerConfigurationAccessor interface added BaseSSOAuthenticationFilter to get at local server name info from file server configuration
- toString() added to CIFSAuthenticator so that we can still properly log the authenticator type
- Fixed WebDAVServlet to go through ServerConfigurationAccessor interface to avoid ClassCastException

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-04-03 11:29:18 +00:00
Dave Ward
972dd9a4ba MOB-651: Decouple File Servers from Config Service and Authenticators 
- Minor JLAN changes (backward compatible)
   - CIFSAuthenticator implements an interface (to allow dynamic proxying to authentication subsystem)
   - CIFSAuthenticator accesses ServerConfiguration via ServerConfigurationAccessor interface and doesn't retain references to config sections (again to allow dynamic proxying and hot swapping)
   - ConfigSections have way of directly setting container initialised authenticators, sharemappers, etc.
   - Authenticators, etc. still support initialisation from config service in backward compatible manner.
- Most of ServerConfigurationBean moved to AbstractServerConfigurationBean superclass.
- New org.alfresco.filesys.config package with ServerConfigurationBean implementation and supporting classes that can be initialised by a Spring container.
- File server authenticators moved into authentication subsystem. TODO: Kerberos and NTLM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-04-01 13:22:06 +00:00
Gary Spencer
26d5c95982 Merge 3.1 to HEAD: 
13314: Fix for CIFS offline sync, reconnect updated file to properties/history. ETHREEOH-1247.
  13334: Added attribute to allow CIFS host announcement to be switched off via custom config. ETHREEOH-1356. Fixed bug in Windows domain name config.
  13335: Changed error message to warning, and removed stacktrace, when resolving the server name.
  13336: Renamed file-servers-custom.xml out of the way, to .sample2. Seems to be from an Adobe merge.
  13377: Hack to enable basic CIFS IPv6 support, enabled via <tcpipSMB ipv6="enabled"/> in the xml config file.
  13399: Fixed confusing debug message.
  13431: Added missing parsing of 'offlineCheckInterval' parameter.
  13457: Added support for file locking on in-memory pseudo files. Fix for problem with __AlfrescoClient.url files ETHREEOH-1311
  13485: Added the missing CIFS sessionTimeout config value parsing.
  13521: Updated file-servers.xml default config to match previous file-servers-custom.xml settings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-03-27 13:27:03 +00:00
Derek Hulley
cf86bf466c Merged V3.1 to HEAD 
13077: Abstracted ContentStore MBean operations
   13099: Merge V3.0 to V3.1
      13096  Merged V2.2 to V3.0
         13071: Fix ETWOTWO-1058: Hibernate exception while concurrently submitting from and updating same user sandbox.
         13079: Fix ETWOTWO-1117: Misleading exceptions reported during AVM flatten and update
   13102: [no comment]
   13112: Merged V3.0 to V3.1
      13111: Merged V2.2 to V3.0
         13110: Fix 2.1 -> 2.2 upgrade on Postgres
   13114: Build/test fix (Enterprise Remote API project does not yet have any Java files to generate Javadoc)
   13117: DM Index Check - unit test improvements
   13123: *RECORD ONLY* Removed svn:mergeinfo fluff
   13124: Used newer, more efficient NodeService.addProperties method instead of many NodeService.setProperty calls
   13125: Added M2Binding for 'child-association': propagateTimestamps'
   13126: WCM unit tests - reduce build/test time to check (async) submits
   13127: Minor test fix - to allow it to run locally (on Mac OS X)
   13130: Support for 'maxRetries' of zero or less
   13131: Merged V3.0 to V3.1
      13025 *RECORD-ONLY*: Removed unnecessary svn:mergeinfo
      13026: Merged V2.2 to V3.0
         12964: Fixed ETWOTWO-968: Space rules are not run when saving from MS Word
         12993 *RECORD-ONLY*: added openoffice bootstrap context to sample-extensions
         13009 *RECORD-ONLY*: Avoid default OOo config from causing problems on zip/gz installs
   13132: Updated svn:mergeinfo
   13134: ETHREEOH-1202 - initial fix and unit tests
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13005,13025-13026,13030,13039,13042,13050,13053,13096,13098,13111
      Merged /alfresco/BRANCHES/V2.2:r12964,12993,13009,13071,13079,13110
      Merged /alfresco/BRANCHES/V3.1:r13077,13099,13102,13112,13114,13117,13123-13127,13130-13132,13134


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-03-11 13:19:59 +00:00
Derek Hulley
2c563871d8 Merged V3.1 to HEAD 
13033: Back end support for ETHREEOH-1179
   13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
   13046: Merged V3.0 to V3.1
      13043: Merged V2.2 to V3.0
         13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
   13049: Build/test fix (WCM AssetTest)
   13057: Merged V2.1-A to V3.1
      8770: Added Flex SDK module
      8771: Added Flex SDK binary (swc)
      DH: I'm not sure about the svn:eol-style property appearing here.  SVN Clients?
   13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
   13060: [no comments]
   13061: [no comments]
   13063: [no comments]
   13064: [no comments]
   13066: [no comments]
   13067: Add NodeService.getChildrenByName
   13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13043
      Merged /alfresco/BRANCHES/V2.2:r13016
      Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-03-11 04:21:44 +00:00
Derek Hulley
f1307fba20 Merged V3.1 to HEAD 
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
   13000: Added log4j to Eclipse classpath (unexported)
   13001: Merged V2.1-A to V3.1
      9127: Performance improvement to folder copy
      9151: *RECORD-ONLY* Fix index back up failing with missing files
   13002: Merged V2.1-A to V3.1
      9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
      9279: Fix ADB-84. PHP module is not restricted by the upper version
      10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
   13006: Merged V2.1-A to V3.1
      10893: Fixes for ADB-78 & ADB-98
             - Fixed service getter/setter pattern as well
      10903: Fix for ADB-115 ACT-4355
   13010: Made AVMLockingBootstrap resilient to read-only mode
   13011: Better message for InvalidStoreRefException
   13013: Merged V2.1-A to V3.1
      9189: Composite Conditions Support Part 1 of 2 (repo)
      9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
   13015: Port of Adobe CIFS/FTP configuration changes
   13017: Convert avoids folders given by '--svn-status' option
   13018: Merge V2.1A to V3.1
      7746: (record-only) Added ability to specify a custom CIFS authenticator class
      8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
      8700: (record-only) Update to prevent any native calls via configuration code
      8705: (record-only) Filer out the '0.0.0.0' bind address
      8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
      9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
      8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
      12144: (record-only) CIFS virtual circuit fixes
   13020: Merged V2.1-A to V3.1 (Composite Actions)
      9191: Composite Conditions Support Part 2 of 2 (client)
      9243: Composite Conditions Support Part 1 of 2 (client)
      9245: Composite Conditions Support Part 2 of 2 (repo)
   13021: Merged V3.0 to V3.1
      13008: Merged V2.2 to V3.0
         12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
   13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
      Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2009-03-11 03:22:35 +00:00
Kevin Roast
036e9179f7 Merged V3.0 to HEAD 
11590: Explict list of Win binaries to include in tomcat bundle
   11592: Created an extra class between NTLanManAuthContext and the AuthContext base class. ETHREEOH-601.
   11593: Base the AuthTokenAuthContext on the new ChallengeAuthContext, implemented getChallenge() to retrieve the NTLM challenge from the auth token. ETHREEOH-601.
   11595: Changes to FTP base code required for passthru authentication.
   11596: Passthru FTP authenticator implementation.
   11604: Fix for ETHREEOH-715: Forms drop down is still present in 'Create Content Wizard'
   11605: Fix for ETHREEOH-726 - Unable to accept/reject email invite from Share when NTLM filter is enabled on web-tier.
   11609: Final part of fix for ETHREEOH-726 - fix to issue where login page would be displayed even though user had authenticated correctly over NTLM.
   11610: Correct NTLM sample config for web-tier.
   11611: Fix to ETHREEOH-728 - RSS feeds now work when NTLM is enabled.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12478 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2008-12-18 10:15:15 +00:00
Gary Spencer
e27a8561ee Merged V2.2 to HEAD 
10641: Fix for ETWOTWO-640: Cannot login through FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2008-09-05 18:11:28 +00:00
Gary Spencer
6478d72321 Replaced the file server code with the Alfresco JLAN project. 
Restructured the file server code packages.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7757 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2008-01-06 16:44:00 +00:00