16971: Merged V3.1 to V3.2
14282: (RECORD ONLY) Updated version to 3.1.1
14565: (RECORD ONLY) Updated version to include revision number (x.y.z)
14848: (RECORD ONLY) Updated version number
15029: (RECORD ONLY) ETHREEOH-441 and ETHREEOH-1862 Exceptions in server when certain PDFs are uploaded.
- Probably done already without merge info
- Renamed source zip to help tracking
15985: ETHREEOH-2292: Deployment failure in case of IPv6 on Win 2k8
16164: Fixed ETHREEOH-2690: JGroups TCP doesn't bind to specified address
16240: (RECORD ONLY) Fix typos in installer
16726: Fix ETHREEOH-2677 - user usages (when taking ownership)
16745: Fix ETHREEOH-2991 - Deployment exception, unable to deploy - when deploying a manual snapshot with a stale file
16771: (RECORD ONLY) Fix to ETHREEOH-441
- Probably merged without merge info
16822: Merged DEV/BELARUS/V3.1 to V3.1
16753: ETHREEOH-1951: when versionable aspect is active, using the Microsoft Word option ...
16825: Fixed ETHREEOH-803: Incorrect mimetype is displayed for .pps and .pot files
16862: Fix for ETHREEOH-801 Fail to extract some kind of PDF file metadata
- Resolved merge by prefering merged-in fix
16880: Merged V2.2 to V3.1
13966: (record only) Updated to use ALF-BINARIES version of installjammer
14340: (record only) Fix so deployment installers build
14719: (record only) Tweaks to AMP
15153: (record only) Fix ETWOTWO-1264 - PHP integration
15287: Fixed ETWOTWO-989: MS Sql server upgrade from 2.1.6 failed
15351: ETWOTWO-1345 (script not matching patch ID)
16928: Fixed shutdown: Task threads are now daemon threads
16986: Merged V3.1 to V3.2
16932: Moved Lucene ResultSet prefetch code to use NodeBulkLoader (backed by common code in Node DAO)
16945: (RECORD ONLY) Merged V3.2 to V3.1
16931: Fixed build unit test path for recent Chiba lib change
16957: Removed Hibernate event listener after 3.2.3 CGLib fixes
16959: Applied fix for ETHREEOH-2121: ContentUtils.getContentAsString does not pass JSESSIONID into the request
16961: (RECORD ONLY) Updated db settings in configs
16964: (RECORD ONLY) Merged V3.2 to V3.1
16308: ETHREEOH-2833: The Content rule with 'Items with specific text value in property' condition can't be created.
16968: Fixed ETHREEOH-2120: Recently Modified Documents Dashlet failed to load after a big upload
16983: Build fix: avoid queries for parent assocs if no nodes were found during child node in caching
16991: Merge V3.1 to V3.2
15136: (RECORD ONLY) : changes have already been merged.
MERGE 2.2 to 3.1
14985 - ETWOTWO-1174 - Preview of protected PDFs results in an error
14305 - ETWOTWO-951 - contribution
14601 - ETWOTWO-1236 - Make FSR deployment case sensitive.
17022: MT - fix fallout from r16924 - add inbound collection support to MT node service interceptor (caught by MultiTDemoTest.testCreateGroups)
17023: Fixed parentAssocCache bug when adding assocs against an empty cache
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
15203: ETHREEOH-2246: Rework patch.authorityMigration to be more performant and report progress
15254: ETHREEOH-2339: Fixed NullPointerException when editing LDAP-synced user who doesn't have an email address
15267: Applied patch for ETHREEOH-1448: Exception when using the move up/down button when editting a web form
15270: Mereg (sic) - Record only 15238
15285: Merged V3.1 to V3.2
15281: Merged V2.2 to V3.1
15280: Absorb all metadata exceptions at all levels
15282: Merged V2.2 to V3.1
15273: Merged V3.2 to V2.2
15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
-------------------------
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.2:r15273,15280
Merged /alfresco/BRANCHES/V3.1:r15281-15282
Merged /alfresco/BRANCHES/V3.2:r15200,15203,15254,15267,15270,15285
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- All supporting classes moved out to thirdparty subsystem
- Open Office service automatically started if available
- All utility locations editable via JMX (and subsystem can be reinitialized with new values without rebooting tomcat)
- New ContentTransformerWorker interface introduced in order to allow separation between ContentTransformer registry and third party utilities
- Existing JMX query capabilities preserved
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8372: Merged V2.1 to V2.2
8314: Merged V2.0 to V2.1
7750: Fix for ACT-475: ContentStoreCleaner causes OutOfMemoryError
8332: Made content URL column larger to accommodate the extra locale info present in 2.1
8334: Build fix: V2.1 tighter on authentication for getTempWriter
8376: Merged V2.1 to V2.2
8325: Fix for AWC-1089
8361: Workaround for WCM-882: All metadata extracters can now handle zero length files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8206: Merged V2.1 to V2.2
8136: Fixed AR-2043: XPathMetadataExtractor extracts empty strings
8169: Fixes to Office add-in for ACT-267 - saving over an existing non-versionable file.
8172: Fix for AWC-1838
8221: Merged V2.1 to V2.2
8210: Fix for AR-1830 - Search not returning expected results for umulat characters
8211: Fix for AWC-1463 - MyWebForms and MyWebFiles templates now check for existance of stores before displaying them
8222: Merged V2.1 to V2.2
8216: Fix for AWC-1357
8223: Missing Serializable interface (for web UI clustering)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8078: Merged V2.1 to V2.2
8025: Fixes WCM-1039, problems with case insensitive name handling.
8079: Merged V2.1 to V2.2
8035: -- DONE SEPARATELY --
8040: Fix AR-1985: SQL Server dialect is derived from Sybase dialect there need additional no-op script
8046: Better Javadocs for getChildByName()
8056: Fixed WCM-790: Date conversion for metadata extractors
8057: Fixed WCM-790: Properties that don't convert can be discarded (default is to fail)
8059: -- DONE SEPARATELY --
8061: Fixes WCM-790: Fallout from CHK-2168 and CHK-2169
8081: Fix for WCM-1018
8082: Merged V2.1 to V2.2
8016: Merged V2.1-A to V2.1
8000: Additional indexes for AVM
8013: Patch to introduce reverse indexes required for AVM
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7534: Merged V2.1 to HEAD
7398: XPath metadata extractor selector handles malformed and empty XML files
7401: Fix AR-1879: JBPM Timer never fires
7413: Contribution: Integrity checker ignores exceptions that would normally trigger transaction retries.
7416: AR-1884.Unicode wildcard processing.
7417: Added filtering of pseudo files when a partial wildcard search path is used, such as '*.csv'. AR-1889.
7436: AR-1863: major version's can now be created via the web service API;
7451: Fix for handling of UTF-8 application/x-www-form-urlencoded encoded form arguments as raised in support ticket 242
7458: Fix for AR-1900
7520: Fix to Template API where content was not retrievable from custom d:content properties on a node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6556: AVM performance tweaks
6557: WCM-758.
6558: Fixes WCM-753.
6559: better handling of rename, copy and paste for form instance data and renditions. addresses WCM-752 and partially addresses WCM-559.
6560: Renamed JndiTest.java until we decide to keep it or not.
6561: Oops.
6562: probable fix WCM-669
6563: Build fix after the removal of flushing suport
6564: Fix for WCM-728
6566: Support for avm index clustering via tracking - WCM-762
6567: Test fix after flush changes
6568: Fixed AWC-1517: Can now create space based on existing top-level space
6569: misc IE fixes.
6570: Various changes to improve AVM import performance and submit performance.
6571: Session flushing is now deprecated and doesn't fail with an exception.
6572: Reduced the iteration count to stress nextResults calls a bit more
6573: WS query sessions put back into cache after more results have been fetched.
6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6466: Xml metadata. Support for pulling collections of values from XML
6470: Fix for AWC-1321 - Using zero as items per page gives error for Alfresco repos in OpenSearch
6471: Fix for AWC-1496 - OpenSearch dashlet can get in a state where search queries are not executed
6472: Fix for AWC-1495. Searching additional attributes now working correctly for folders.
6473: Fix for AR-1251 (Version error when saving new content via CIFS)
6474: Updated bundles and installers - added missing files back into Linux bundle
6475: LDAP and chainging authentication
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\security\authentication\AuthenticationUtil.java'
6477: XForms WCM-696.
6478: Fix for WCM-567 (IndexOutOfBoundsException when stepping through wizard rapidly)
6480: Fix to issue when removing locks on directories.
6481: Updated installer and config wizard to fix download option and config behaviour when called from installer.
6482: Fix for WCM-1229 (properties sheet does not refresh)
6483: Fix for AR-1511
6484: Fix for AR-1351
6485: Missed a unit test update
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6455: OpenOffice transformer and extractor register regardless of the initial connection state.
6456: Fix for WCM-636 (Clicking OK twice while deleting web project results in exception)
6457: Updated installers and associated config
6458: AR-1669 Add getQnamePath to Javascript
6459: Fix for AWC-1456 - Word and Excel documents were being stored as octet streams rather than their correct mimetype
6460: Reverse order of reject & approve transitions, so that approve appears first in list of ui actions.
6461: Removed Process.exe (often detected as a virus) and updated config wizard.
6462: Switch to synchronous indexing for AVM by default
6463: Better support to query the state of AVM indexes
6464: Added Office 2007 document mimetypes and icons
6465: Added Office 2007 icons without the typo this time
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
ApplicationContextHelper now gives out a singleton ApplicationContext and includes a 'closeApplicationContext' method.
Pulled all "org.alfresco.repo.content/**Test" classes into a single test suite.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- first pass at starting the workflow from create content. i'm able to start a workflow with parameters collected by the create website wizard. however, i'm not able to associate files with the workflow yet due to some problems with the workflowservice. i'll wait until word from britt or dave before continuing on this.
- making usage of workflowdefinition.id the key for workflows across the model since getWorkflowDefinitionByName isn't as reliable as getWorkflowdefinitionById for some reason
- adding FormProcessor back in; looks like it got removed in a merge.
- fixing localized strings in configure rendering engines
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
