13265: Fix incorrect wiring of guest user name
13266: Merged V2.1A to V3.1
13252: Fix ADB-159: Generation of content model xml throws exception
13267: Remove accidental addition of folders
13280: IndexTransactionTracker logging changes
13281: Added bean to push properties from repository properties into the VM properties
13283: Added forgotten Hibernate diff file after JAWS-223 fix
13291: Fix ETHREEOH-1340: Alfresco Repository Draft CMIS Implementation" link refers to localhost
13297: Fix ETHREEOH-885: workflow mapAuthorityToName tests don't handle sub-classed objects correctly.
13308: First part of JAWS-215 - permission migration from V2.1-A to V3.1
13313: Build fix for 2.1-A to 3.1 ACL patch
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r13252
Merged /alfresco/BRANCHES/V3.1:r13265-13267,13277-13283,13286,13289,13291,13295,13297,13308-13313
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12984: Sharepoint: Build fix after recent change to SiteService and bumped module version to 1.1
12997: (RECORD ONLY - Already merged) Added home property to start scripts; updated readmes; updated installers
13140: Merged V3.0 to V3.1
13138 Merged V2.2 to V3.0
13133: Fix ETWOTWO-1078: wcm submit does not complete when using Oracle
13146: Merged V3.0 to V3.1
13052: CIFS throws a NullPointerException if a non-relative path is received for a folder search. JLAN-69
13147: Updated svn:mergeinfo
13151: (RECORD ONLY) Changed labs -> enterprise for distribution bundles
13157: Partial fix for ETHREEOH-1277 - fixes usage of Application.getMessage()
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13052,13138
Merged /alfresco/BRANCHES/V2.2:r13133
Merged /alfresco/BRANCHES/V3.1:r12984,12997,13140,13146-13147,13151,13154,13157
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
12109: AuthenticationUtil and AuthenticationComponent refactor
12152: Removed Lucene usage from lookup of 'sites' root folder
12153: Fix InviteServiceTest by cleaning up leaking authentications
12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10931: Merged V2.1 to V2.2
9931: Fix for https://issues.alfresco.com/jira/browse/ETWOONE-295
10094: Further fix for ETWOONE-241: SAXException - XML parser apparently is not thread safe
10101: Resolve ACT 1282: wcm workflow falling over on Oracle while hitting in clause limit of 1000 expressions.
10188: https://issues.alfresco.com/jira/browse/ETWOONE-74 (Part 1)
10447: ETWOONE-328: performance improvement added to rule trigger code
10455: Fix for ETWOONE-306.
10292: Fix for ETWOONE-92: If two users update the same contents at the same time, you get InvalidNodeRefException
10293: Fix for ETWOONE-116: Send email action does not handle invalid email address
10294: Fix for ETWOONE-164: when a powerpoint 2007 pptx is stored in alfresco ...
10341: Action Evaluator request level cache
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8514: Updated clusterd cach example - ACL changes, attributes, AVM and minor fix ups
8522: Fix for AR-1694
8587: Merged V2.1 to V2.2
8575: Fix for AR-2166 "Display of tasks in MyAlfresco dashboard broken when using oracle"
8617: AVMTestRemote - fix test/data
8632: Merged V2.1 to V2.2
8623: Fixed AR-2122: Code re-entry paths through transaction resource interceptor cause data loss
8624: Fixed test associated with session resource management fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8371: Merged V2.1 to V2.2
8307: Next round of fixes for session management.
8309: Fixed AR-1891: Long MLText strings fail in Oracle
8313: Fix for case where existing MLText entry is null
8319: Follow-up fix for NPE where StringValue is null when persisting
8331: Fix for AR-1696: Long text in an aspect property causes an exception
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
8286: Merged V2.1 to V2.2
8256: Fix broken WCM workflow.
8257: Partial fix for AWC-1850
8283: Merged V2.1-A to V2.1
8264: Fine-grained debug logging for exceptions causing transaction retries.
8288: Should fix workflow problems. Hard to test since almost nothing works right now.
8291: Added Peter's fixes to improve deployment start scripts
8294: Update deploy script from Peter
8298: Fix for WCM-1058:
8300: Commented out admin dashlet (active_tasks)
8359: Fix AR-1735: Customer-requested POI upgrade
8367: Fix for AWC-1639
8368: Fix for WCM-1102
8389: Revert changes between r8072 and r8251 from Schema2XForms.java
8401: Fix for WCM-1105
8407: Minor typo fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8488 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
7530: Merged V2.1 to V2.2
7378: Fix AR-1862: Failure to map Alfresco properties whose namespace prefix contains _ to jBPM variable
7379: Fixes to handling of invalid web script definitions on startup of server.
Done previously 7379: HEAD rev 8343 (CHK-2418)
7380: Adds some evicts during snapshotting to reduce 1st level cache use for large snapshots.
7385: Fix for File Upload message XSS (or not) issue
Outstanding
7391: Fix for AWC-1686 - WebClientPortletAuthenticator does not start usertxn when calling public services
Outstanding
7394: AR-1875: New Edition on a multilingual document when a rule is present on the parent space
7396: Fix AR-1873: Add Location to webscript response status
Done previously in HEAD rev 8344 (CHK-2419)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6609: Portlet UI (doclist, myspaces, mytasks) updates following design review
6610: AR-1270
6611: debugging WCM-778.
6612: Improved API documentation.
6613: Added store lookup cache to EHCache config for default and extended cluster sample
6614: AWC-1531 and AWC-1146. Link objects that have targets which the user does not have access to are now filtered from the view.
6615: AR-1664: Bootstraping from full export fails if file names differs only with a space: my file, my file
6616: Fixed AR-1519: Possible duplicate entries when moving nodes between stores
6617: Removed deprecated aspects; Added emailed aspect to messages; Added OOo command line options
6618: Fix for AWC-1350
6619: Fix for AWC-1509
6620: AWC-1179: Searching for users in Invite User Wizard is slow with large number of users
6621: Changed shutdown logic to avoid classloader cleanup race.
6622: Fix for AWC-1533 (can't save office docs to Company Home)
6623: Fix for AR-1705
6624: Better fix for AWC-1256 (links generated by tinyMCE editor)
6625: Fixed AR-1713: Transformers that do nothing don't break full text indexing
6626: Fixed AWC-1438: Added explcit TXT to PDF converter that wraps the PDFBox TextToPDF class
6627: Portlet templates now handle missing description property on web form
6628: Fix WCM-788
6635: Make workflow available for users who cannot see company home
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\jbpm\JBPMEngine.java'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6368: Change home folder provider to use User Homes and not company home
6370: Fixed BDE-50: Empty line in the clean_tomcat.sh script file
6373: Working copy nodes don't get sys:temporary aspect applied.
Node archival ignores working copy nodes.
6375: Fixed AR-1154: Benchmark override sample
6377: Documentation updates.
6379: Moved old installer files.
6381: Fixed AR-782: Early detection of property conversion issues
6382: Fixed AR-1414: Serializable property values are immediately disconnected from the client's instance.
6384: Fix AR-1642 : Pooled task is not auto-assigned when task is completed by user, but user has not first 'taken ownership'
6385: AR-1621 Workflow bootstrap is not sensitive to system read-only mode
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of
its use otherwise.
I took a glance over the areas of the code that use UserTransaction directly and didn't see any
transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write
transactions in a concurrent scenario). If you spot any that you think might qualify, let me know.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
-- addition of get process definition history
-- addition of get active timers (for a process definition)
-- addition of fire custom workflow events
-- addition of get process variables
- Workflow Console
-- addition of undeploy all versions of a process definition
-- addition of list all versions of a process definition
-- addition of list workflows for previous version of a process definition
-- addition of query tasks
-- addition of firing custom workflow event
-- addition of list timers
-- addition of show process variables
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- submit process now allows for delayed submissions (launch date may be entered during submit)
- in case of delayed submission, initiator is sent "submission pending" task with actions for cancelling submission and submitting now. On launch date, submission is made, removing "pending" task from initiator.
- approved task is now submitted task
Fixes to jBPM Timers:
- fix to ensure task is ended when associated timer is fired
- fix to ensure Alfresco transaction is active when triggered node action is executed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5687 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
