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
44674: Fix for ALF-17189 - The "Company Home" item in the top navigator menu and in the toolbar panel is invisible, if login as guest first then directly access the login page via URL.
44701: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
44700: Fix for ALF-10369 - support for OPTIONS requests for WebScript framework and Share proxy
44709: ALF-17164 Fix version.properties which was wrong in sdk zip
44710: ALF-14570 ("Check out" outboud rule works incorrect)
44722: MNT-246: Need the ability to configure a proxy with Enterprise Sync.
- RemoteConnectorServiceImpl will now use an http/https proxy if the standard system properties for Java network proxy configuration are found. See http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html (Section 2.1 and 2.2)
44730: Merged V4.1 to V4.1-BUG-FIX
44461: Merged PATCHES/V4.1.1 to V4.1
44060: ALF-16962 / MNT-221 Links from a deleted user cause error in the "Links" page
44129: ALF-17134 / MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
- Now we emulate the behaviour of ACLEntryAfterInvocationProvider in SolrQueryHTTPClient, thus limiting otherwise unconstrained SOLR queries to return a finite number of results
- New solr subsystem parameter solr.query.maximumResultsFromUnlimitedQuery introduced
- Its default value is ${system.acl.maxPermissionChecks}, thus providing backward compatibility with old behaviour (1000 results max)
- When there are no other limits in the search parameters, this value will be used to limit the number of results
- SolrJSONResultSet.getResultSetMetata().getLimitedBy() will return an appropriate LimitBy value, according to how the query was limited
44130: ALF-17134 / MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
- Improved calculation of SolrJSONResultSet.getResultSetMetata().getLimitedBy() to better emulate ACLEntryAfterInvocationProvider
44141: ALF-17134 / MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
- Correction to handling of limited queries (Share search works again!)
44291: ALF-17094 / MNT-222 InvalidNodeRefException on user deletion in Share UI
44462: Merged PATCHES/V4.0.2 to V4.1
44221: ALF-17038 / MNT-226: Out-of-order versions for existing data during migration from 3.4.9 to 4.0.2.19
- Have been able to remove the need for any Comparators in the normal case.
As Dave said, he thought it was ordered already. It is with "assoc.assoc_index ASC, assoc.id ASC".
Required a bit of re factoring of Version2ServiceImpl to do it as they were referenced/used in a couple of other classes.
- Modified all 43 Oracle sequences to include ORDER in the create statement.
Probably only really was needed to do it on alf_child_assoc_seq to fix this issue, but it will stop similar issues in
other clustered database setups. Did not change the upgrade scripts, as this will give us a clue that there will be
existing data issues.
- The name of a Comparator<Version> may be specified in the Alfresco global property:
org.alfresco.repo.version.common.VersionLabelComparator and it will be used by BOTH Version2ServiceImpl and VersionServiceImpl.
They in turn pass it on to Version2ServiceImpl instances when they create them.
- A VersionLabelComparator already existed (still deprecated as we don't normally use it) and works:
org.alfresco.repo.version.common.VersionLabelComparator.
- Customers with out of sequence ids on Oracle RDBMS using a clustered database may 'correct on the fly' the order of their
versions by setting the alfresco global property described above.
- Have tested both with and without a comparator in development environment. Using break points and Collections.shuffle(version)
in an expression was able to simulate out of order IDs.
- New unit tests added to VersionHistoryImplTest and VersionServiceImplTest to test db ids out of order
44336: ALF-15935: Fixed SecureContext errors when ticket has expired. MNT-180
44467: Fixed compilation failure
44520: ALF-16590: Improved fix after testing by Mark Lugert
44563: Merged DEV to V4.1 (with corrections)
44547: ALF-17132: Possible XSS - arbitrary url parameters re-sent to the browser
Escaping of keys and values of request attributes
44610: Merged PATCHES/V4.0.2 to V4.1
44435: ALF-17183: Merged DEV to V4.0.2 (4.0.2.22)
44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
- Initialize rootRefs in the property definition to prevent NPE.
44591: Fix to CIFS reported user free space when disk quotas are not enabled.
44595: ALF-17184 / MNT-243 Minimal fix for disk size and user quotas. (Bring values into line with API.)
44601: ALF-17184 / MNT-243 - Implementation of file size on Abstract Tennant Routing Content Store.
44608: ALF-15935 / MNT-180: Moved closeFile() call to closeConnection() cleanup method, always call closeFile()
Do not check if file is marked as closed during cleanup, only open files should still be in the file table.
44652: ALF-17117: Created article or publication cant be viewed on WQS site
- Fixes by Dmitry Vaserin
- Removed unnecessary outer read locks from getRelatedAssets and getRelatedAsset to prevent deadlock
- Correct markup error when node doesn't have tags
44653: ALF-17117: Created article or publication cant be viewed on WQS site
- Missed file from previous checkin
44682: ALF-17118 WQS: Impossible to upload document to publications space
- Only first part to do with the transformation failure has been committed.
44731: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
44441: Merge V4.1-BUG-FIX to V4.1
44270: Merge V3.4-BUG-FIX to V4.1-BUG-FIX
44266: BDE-111: harden generation of Windows installers
- make sure build fails if installer generation fails
- generate Windows unsigned installers in a place that is cleaned later, avoiding leftovers
44598: Merged V4.1-BUG-FIX to V4.1
44541: Fix for ALF-17151 SOLR - add support to disable permission checks
44577: Final part for ALF-16558 SOLR tracking does not do incremental updates but one single chunk
- fixed code so SolrSearchers are held for as little time as possible
44607: Merged V4.1-BUG-FIX to V4.1
44603: ALF-14201: upgrade activiti to 5.7-20121211
44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
- NPE when there is no exception message
44046: MERGE DEV to V4.1-BUG-FIX
ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node. If it exists it doesn't add it again.
44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
44319: Latest installer translations from Gloria
44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
<< Regression introduced into 4.0.2 on 12/4/12 r35201 >>
44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
- Fix for regression from ALF-11956, connected with setting titles for file picker controls
44316: Merged DEV to V4.1
44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
Handle Mac 2011 Word backup in scope of RenameShuffle
44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- fix incremental cache state to cope with duplicate leaf/aux doc entries.
44283: Encoding fix by David Webster
44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- fix initial cache state to cope with duplicate leaf/aux doc entries.
44252: Russian fix from Gloria
44200: Probable fix for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- still difficult to reproduce
44149: Merged HEAD to V4.1
44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
44039: Version in parent-pom was not changed properly when deploying to Maven repo
44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
- CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
- and then blowing up as it continually fetched into the same in-memory HashSet!
44404: Merged DEV to V4.1-BUG-FIX
44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
2. Added a simple implementation for SOLR to use
3. Made M2Label look up model labels via a supplied MessageLookup argument
4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
5. Accounted for interface changes throughout.
44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
- Not just Ghostscript but any thumbnail failure
44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
- got the wrong branch
44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
- Not just Ghostscript but any thumbnail failure
44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
<< Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
44435: Merged DEV to V4.0.2 (4.0.2.22)
44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
- Initialize rootRefs in the property definition to prevent NPE.
44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
MNT-211 (Still needs implementing on 4.1)
44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
44511: ALF-16791: Added missing class.
44519: ALF-16791: Fixed broken unit tests
44541: Fix for ALF-17151 SOLR - add support to disable permission checks
44542: MNT-211 Re-implement on 4.1
44548: ALF-16791: Fixed broken SOLR
44559: ALF-17075: "Exporting and importing null MLText values does not work."
44577: Final part for ALF-16558 SOLR tracking does not do incremental updates but one single chunk
- fixed code so SolrSearchers are held for as little time as possible
44590: ALF-14523 (Share - Metadata constraint on workflow creation)
44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
44600: ALF-16791: Another omission not covered by unit tests
44603: ALF-14201: upgrade activiti to 5.7-20121211
44605: Added missing vti.server.url.path.prefix property required by commit 43471
Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
Check if external authentication is active in BaseServlet
44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
Initial implementation by Dmitry Velichkevich.
Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
44632: addition of validation of NetworkFile isClosed property.
44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
also, sneak in the SVN path, so that tracability is complete
44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
44651: ALF-14348 (Unable to update external blog configuration details)
44654: Merged DEV to V4.1-BUG-FIX
44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
Added a message bundles for FullControll access role.
44655: Merged DEV to V4.1-BUG-FIX
44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
Ignore user credentials for the OPTIONS request.
44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
Ignore user credentials for the OPTIONS request.
44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
- Wrong node was being used for access checks
- Fix by Andrey Chernov
44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
- Now we can cope with a runAs where the username is in the wrong case
44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
12310: Merged V2.2 to V3.0
12306: Merged V2.1 to V2.2
12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
12312: Merged V2.2 to V3.0
12311: Merged V2.1 to V2.2
11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
12316: Fix for merge issue
12317: Merged 2.1 to 3.0
12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
12321: Missing file from previous checkin
12324: Merged 2.2 to 3.0
12320: Merged 2.1 to 2.2
11682: Fix for ETWOONE-87: Behavior of delete cascade
12326: Merge 2.1 to 3.0
11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6933: Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Updated web services, SDK and web client where appropraite
- Patch added to migrate existing rules
- Entire rule service can now be disabled programmatically
- Rule service is now disabled during the patching process
- StoreEnum and languageEnum types removed from web service interfaces
- Multiple rule types now supported in the repo (but not in the UI)
- Removed owning node ref from action and rule .. now calculated from methods on the rule service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- each wizard now has its own list of types
- made the inline text editing page the default page in create content wizard
- dialog and wizard config is now global
- fixed problem with create content wizard action
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added a new action to the repository for executing JavaScript files
- Added script action UI to rule framework, means we can execute a JavaScript file as part of a rule
- Lucene search and Saved Search functionality added to default data-model for scripts
- Added Scripts folder to Data Dictionary (created during bootstrap)
- Created patch to add the Scripts folder to existing schemas
- Added ScriptService to ServiceRegistry bean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
