13867: Fix for ETHREEOH-986 - long names in Explorer details view show correct width in FF browser
13869: Fixes for ETHREEOH-1387 and ETHREEOH-1390
13872: Fix for issue where custom-web-framework-application-context should be optional in the web.xml for web-framework project.
13909: Fix for ETHREEOH-1684
13910: Fix for ETHREEOH-1266
14015: Fixes for ETHREEOH-1864 and ETHREEOH-1840
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
12236: Implementation of Sandbox Revert REST API
12305: WCM Services - "asset service" initial checkpoint (more tests to be added)
12334: placeholder for WCM Asset implementation
12338: Check in to get server working ...
12341: WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12297: Fix mysql config instructions for case sensitive user names - DOC-68
12298: Merged V2.2 to V3.0
12257: Fixed ETWOTWO-952: MLText properties not intercepted when calling addAspect and createNode
12270: Fixed RhinoScriptTest to propogate exceptions for full recording by Junit
12271: Fixed NPE in ML interceptor when null node properties are passed to createNode
12282: Merged V2.1 to V2.2
11616: Fix for ETWOONE-218: Common.js function needs to be changed to support root context
12287: Merged V2.1 to V2.2
12229: WCM - disable/hide link validation by defrault (ETWOONE-106, ETWOONE-392)
12301: Merged V2.2 to V3.0
12288: Merged V2.1 to V2.2
12233: Fixed ETWOONE-124: Add the property UUIDBinding to ImporterBootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8429: Merged V2.1 to V2.2
8387: Fix for WCM-1090 see ACT 1551
8421: Minor typo fix to OpenOffice document formats descriptions
8422: Fixed AR-2145: ContentStore cleaner was not watching out for VM shutdowns
8423: Removal of default root objects responsible
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8014: Extended support for RunAs - real and effctive authorities
8032: Build Fix - there is a special check for the effective user
8094: Fix for NPE in AuthenticationUtil noticed on first upgrade from V2.1.x to V2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8071: Fix for AR-1694
8072: XFormsNode attributes incorrectly added with all lower case names
8073: Fix for WCM-959
8074: AMP's modularity now extends to the log4j configuration of modules.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8041: Merged V2.1 to V2.2
7736: Fix for broken "make versionable" action after webdav fixes
7755: Fix AR-1962: File is not truncated when opened for overwrite when using the older CIFS open file request
7971: Fix for AR-1964 (IE7 character encoding)
7973: Fixes transient submit failures when submitting deleted directories with no ancestors
7989: ACT-858: AVM Issuer
7994: WebDav document url now available in Template/Script APIs as per AR-1917
8002: AR-1978: Added support for SPNEGO to the CIFS passthru authenticator
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7452: Fixes submit breakage.
7456: Patch to redeploy new submission workflow definition
7457: Added 'View Deployment' action to workflow sandbox so reviewers can examine the last attempted deployment
Added 'Allocated' field to server config, tooltip shows which store the test server is allocated to
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7422: Deployment UI changes
7424: Deployment UI changes
7426: Created 'More Actions' menu for user sandboxes and moved various actions into it
7428: Server config UI
7433: Added ability to deploy a workflow sandbox to a test server
7434: Fixed confusing comment
7442: Enabled users with contributor and reviewer roles to reserve a test server and deploy to it
7443: Preparation for auto deployment
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6944: More hibernate session cache taming.
6945: Times for commits are close to linear in the number of items submitted.
6946: Missing break statement. (Courtesy of Jan).
6948: Fixed session cache eviction problem triggered by resetLayer().
6956: Wrapped AVMService and AttributeService in TransactionResourceInterceptor.
Reverted log4j.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7368 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6636: Temporary hack to fix build.
6637: Better handling of binary string bufs, disable link validation when poll interval is <= 0
6638: Forgotten files for TXT to PDF transformer.
6639: Fix for AWC-1541
6641: Fix for WCM-792.
6642: A little extra PropertyValue support for createNode, too.
6643: Fix for WCM-791
6644: Closure of AR-1528: Check concurrency handling of DuplicateChildNodeNameException
6647: Fix WCM-794
6648: WCM-656
6650: Applied user supplied patch to fix AWC-1546 - Cannot mount AVM using CIFS on new alfresco installation.
6651: Index tidy ups
6654: Various minor updates for passthru authentication debugging and error handling.
6657: Fix for WCM-799 (Some items selected for submission were not present)
6659: Updated installers.
6660: Partial fix to AWC-1524
6661: Fix WCM-803
6664: Including hibernate-3.2.1.jar in $VIRTUAL_TOMCAT_HOME/server/lib/
6665: adding an automated unit test for output path patterns.
6668: Fixed to add shale-test-1.0.4.jar to Eclipse classpath (PHH oked)
6681: Fixes WCM-811 - Lookup.getIndirectionPath() had a bit of a howler in it.
6684: UncategorizedSQLException with the word 'deadlock' in the message is now cause for retrying a transaction.
6691: Fix for WCM-813 (lock not removed when expiration date set and no workflow on web project)
6696: Imporved SSO filters for SiteMinder etc + test filter
6697: Support for scheduled import
6699: Fix for the compliation target: compile-benchmarkframework
6701: Fix for 1.6 JVMs (1.5 gets by with lucky ordering)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6749 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
6486: Fix for AWC-1134 (Made minimum length for username and password configurable)
6487: Added "copy.verbose" property to build script to list all files being copied in the 'deploy-tomcat-exploded' and 'deploy-webclient-changes' targets
6488: Changed default CIFS server to remove underscore as it can cause problems with OpenOffice.
6489: Fix for WCM-498 (Expired items that are deleted are not represented as such in the change request dialog or submit dialog)
6490: Fix for WCM-446 and WCM-624. Multi-select and All operations in Modified Files list respect items in workflow and ignore them.
6491: Fixes profoundly brain dead behavior in AVMLockingService.init().
6492: Refactoring of LookupCache to be clustering compatible
6493: Staging and locking changes
6494: WCM Revert action moved to end of all action lists to avoid accidently clicking it (as it has no confirmation screen!)
6496: Fixes for WCM-746 and WCM-747 - Edit File Properties and Edit Folder Properties working correctly again for AVM objects.
6497: Enable virtualization server to be (re)started at any point prior or during the startup of the alfresco webapp (fixes WCM-750).
6498: WCM-742 - moving locks from the preview sandbox to the main user sandbox.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down.
6439: Fix for WCM-619 & WCM-571
6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324.
6442: Fix for WCM-621 (reviewer can not view or run links report)
6443: Fix for AWC-1488. Dashboard
6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project.
6445: Icons for use in fix for WCM-522
6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6418: Allow getLayeringInfo on deleted nodes.
6419: fixes for submitting of deleted directories and regenerate renditions related fixes.
6420: Added installs to build
6421: Build fix for sdk
6423: WCM-710 - Submit All feature reintroducted to WCM My Modified Files views
6424: OpenOffice connection is now tested on bootstrap.
6425: AWC-1446 - Space Selector would show spaces you do not have access to
6426: WCM-699 - Staging area user assets
6427: Rollback exceptions now explicitly handled by RetryingTransactionHelper to extract the cause of the exception.
6428: Fix for AWC-1340
6429: Fixed transaction boundaries for full index recovery components
6433: AR-1660 - SMB and SMB2 signature check
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6338: Some WCM-435.
6344: Fix for AWC-1452 (dialog close navigation issue)
6345: Fix for AR-1611 and other related CIFS and NFS fixes
6346: Minor javadoc fix for ReplicatingContentStore
6347: Handle exceptions arising from UserTransaction.begin().
6348: Many WCM fixes in one
Conflicts resolved on faces-config-beans.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Reorg to allow sandbox-related constants to be accessed more easily from
other compilation units. AVMConstants had become a dumping ground for
things that had nothing to do with const values. Therefore, this
is now AVMUtil, and sandbox-related constants have been moved to
org.alfresco.sandbox.SandboxConstants, which builds in repository.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5637 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
Support for notification to virt server on dialog-driven revert operations.
No support yet for workflow-diriven revert notification (coming soon).
Details
-------
root/projects/catalina-virtual/source/java/org/alfresco/catalina/host/AVMHostConfig.java
Minor logging cleanup
root/projects/core/source/java/org/alfresco/util/VirtServerUtils.java
Trigger notification on submits of entire dirs: WEB-INF, WEB-INF/classes, WEB-INF/lib
(not just files within them)
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
notify virt server on revert
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java
notify virt server on revert all
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java
notify virt server on revert selected
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
minor cleanup
root/projects/web-client/source/web/WEB-INF/faces-config-beans.xml
Injecting AVMSyncService into AVMBrowseBean to allow virt server
notification to occur only when a comparison between reverted
versions shows it's absolutely necessary
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261