4320 Commits

Author SHA1 Message Date
Neil McErlean
2fbdf1bfa7 Added a convenience method to the ApplicationContextInit @Rule to allow for easier spring overriding in test code.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-27 10:10:18 +00:00
Neil McErlean
c2ac2cae77 Added enhancement to TemporaryNodes rule to allow for dummy content.
Also added a test class for this test rule.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-26 17:50:08 +00:00
Matt Ward
b8e8b5f250 ALF-13441: WebDAV: activities should be raised/published
* WebDAV methods raise activities for file creation, modification, deletion.
* Repository property to enabled/disable activity feed generation is disabled by default.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-26 14:25:26 +00:00
Matt Ward
bb8fd4c88b ALF-10636: CachingContentStore: afterWritingCacheFile() return value is ignored
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-23 10:34:19 +00:00
David Draper
508c880dea Merged THOR1_SPRINTS to HEAD
Performance improvement: prevent unnecessary 304 revalidation requests for thumbnails in detailed view of My-Documents and Recently Modified Documents dashlets
   Fixed bean config problem (caused by r34662)
   Fix build break
   Refactored revalidation code to remove previously added WebScripts that are now surplus to requirements
   Performance improvement: prevent unnecessary 304 revalidation for avatars on site colleagues dashlet
   Performance improvement: prevent unnecessary 304 revalidation for avatars on following/follwers pages
   Performance improvement: prevent unnecessary 304 revalidation for avatars in activity feeds
   Performance improvement: prevent unecessary 304 revalidation for user avatar thumbnails in header WebScript
   Prevent 304 revalidations for unchanged thumbnails in document library, web preview and search

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-22 16:44:48 +00:00
Kevin Roast
728d0a5458 Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD
34666: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
      34664: Fix for ALF-13310 - Hidden renditions cause doclist error
      34665: Second part of fix for ALF-13310 (javascript api)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-22 14:58:30 +00:00
Derek Hulley
84cfba1371 GUID-based directory names
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-22 11:15:43 +00:00
Derek Hulley
b76d38a7a7 Changed from time-based module and component names to GUID-based names. Not likely to affect anything.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-21 18:48:48 +00:00
Steven Glover
a78aa5bd8a Fix build
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-20 09:47:16 +00:00
Steven Glover
5070a0bc6e Fix for ALF-13264: "Cluster Verification Support"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-19 17:01:33 +00:00
Kevin Roast
5ec8d40e1c Coding standards.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-16 10:43:47 +00:00
Nick Burch
fbc668418e Canned Query to find nodes with a given aspect, optionally from only one store. Wraps NodeDAO with the permissions and paging from a CQ
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-08 09:48:04 +00:00
Nick Burch
ece492107e Use ISO8601 dates, not Date.toString, when building the json
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-07 16:34:00 +00:00
Dave Ward
8521d6e2dc Merged V4.0-BUG-FIX to HEAD
34397: ALF-13064: Updated document lib WebScript to protect against access errors dealing with permissions of locked documents
   34406: ALF-13069: Fix flash upload file selection page title corruption
   34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
   34439: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
      34438: Fix to issue where new Hazelcast based Share clustering was broken by a recent SpringSurf change to ServletRequestContextFactory bean config in libs rev 1028 or higher.
   34443: ALF-11433: IE8 specific fix to ensure that document-picker panel is hidden before documents selected event is fired and for TinyMCE to set focus on editor so that content is added correctly
   34457: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34354: ALF-12995 - IMAP: File is modified when received as a message in IMAP account
      34444: ALF-12169: Guest/guest/gUest username is now normalized to corresponding person's user ID during authentication, solving problems with synchronization with Active Directory's Guest account
      34454: Java 1.6.0_31 for 3.4.9 and 4.0.2
   34458: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      34392: ALF-13146: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
            - From Pavel: "Some users from ldap don't have lastName. That is why NPE occurs."
   34459: Merged V4.0 to V4.0-BUG-FIX
      34391: Merged DEV to V4.0 (with corrections)
         34390: ALF-13013 : It's impossible to change Activities Feed properties on Websphere
            Now the Schedule subtree in JMX is set to the correct MBeanServer.
      34407: Merged HEAD-2011_12_06 to V4.0 (4.0.1)
         Updated copyrights 
         32813: ALF-4098: WCM: Assets in in-flight worflow are allowed to be edited.
         Ability of editing assets submitted to 'in-flight' workflow has been removed:
         - .AVMSyncService. service interface was expanded with new method .List<AVMDifference> compare(int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder, boolean expandDirs). to introduce ability of collecting all created/modified items in created/modified folder;
         - all .AVMSyncService. implementations were expanded in accordance with changes in interface;
         - new tests for newly created items, items in modified folder and for deleted items in modified folder were added
      34414: ALF-11607: Bootstrap fails against database 'DB2/LINUXX8664'
      - Patched hibernate jar to recognize DB2 64 bit Linux
      34416: ALF-12992: Updated weblogic DD for SOLR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-06 19:50:32 +00:00
Nick Burch
55fbe62f91 When building the CMIS representation for a noderef ID, if the trailing version number is missing then correctly build the latest version for all cases, not just some
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-05 20:27:40 +00:00
Dave Ward
436352d8a1 Merged V4.0-BUG-FIX to HEAD
34386: Merged V4.0 to V4.0-BUG-FIX
      34384: Fixed further merge problem
      34385: Merge V3.4-BUG-FIX (3.4.9) to V4.0 (V4.0.1)
         34381: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
            34378: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
               Relates to ALF-10976 and ALF-10412 set of changes
               - The last commit to make the sourceNodeRef available to the first child transformer of a ComplexContentTransformer
                 made it available to them all. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 18:33:18 +00:00
Dave Ward
cb7f6f8a5f Fixed up merge issues + Eclipse classpath
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 17:26:28 +00:00
Nick Burch
2b3a580338 Improve the exception if you try to check out an older version of the document
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 16:27:28 +00:00
Dave Ward
840440764b Merged V4.0-BUG-FIX to HEAD
34321: Make CIFS virtual circuit per session limit configurable, return correct status code when virtual circuit limit is reached.
   Required by Terminal Server clients as they can use a single session for all connections. ALF-13156
   34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned.
   34323: Added configuration property for CIFS virtual circuits per session, required by Terminal Server clients. ALF-13156.
   34332: Fix for ALF-8405
   34336: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX:
      34335: Fixing a failing test as part of ALF-13057
   34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - test fix (follow-on to r34279)
   34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - ano test fix (once more with feeling)
   34351: Merged V4.0 to V4.0-BUG-FIX
      34335: (RECORD ONLY) Fixing a failing test as part of ALF-13057
      34350: Merged V3.4 to V4.0
         34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - TransformerOptions.sourceNodeRef now populated
            - Set average transformer time via global properties
            - TransformerDebug of active transformers added
         34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - Fix test failures
         34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer
   34358: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      34324: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
         34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned.
   34360: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      34349: Merged V3.4 to V3.4-BUG-FIX
         34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - TransformerOptions.sourceNodeRef now populated
            - Set average transformer time via global properties
            - TransformerDebug of active transformers added
         34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - Fix test failures
         34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer
         34348: Merged PATCHES/V3.4.7 to V3.4
            34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7
               33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33950: Fix for ALF-12787:
                         - Surf Memory usage optimizations and improvements to ModelObject and derived classes.
                         - Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K.
                         - Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away.
                         - Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity
                         - Added various improved spring config for persister caches and default sizes.
               Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects.
               34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  34107: Added missing jar lib to wcmquickstart and webeditor dependencies
   34363: Merged V4.0 to V4.0-BUG-FIX
      34362: Merged V3.4 to V4.0 (RECORD ONLY)
         34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
         - Fix by Alex Malinovsky
         34348: Merged PATCHES/V3.4.7 to V3.4
            34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7
               33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33950: Fix for ALF-12787:
                         - Surf Memory usage optimizations and improvements to ModelObject and derived classes.
                         - Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K.
                         - Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away.
                         - Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity
                         - Added various improved spring config for persister caches and default sizes.
               Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects.
               34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  34107: Added missing jar lib to wcmquickstart and webeditor dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 15:00:35 +00:00
Neil McErlean
57eef7ee93 Test code changes only: Pulled some Authentication handling out into a common JUnit rule.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 00:49:39 +00:00
Neil McErlean
6cc6268420 More JUnit rules fun. Added a new rule to help with the creation and automatic cleanup of temporary test nodes.
Also refactored RatingServiceIntegrationTest to use JUnit Rules properly.
This class might be a template for future use of Rules. We'll see...


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 00:11:33 +00:00
Dave Ward
7cbbcb9e03 Merged V4.0-BUG-FIX to HEAD
34319: Merged V4.0 to V4.0-BUG-FIX
      34313: ALF-13163: Merged V3.4-BUG-FIX to V4.0
         34311: Fix for ALF-13141 - Share: Flash Uploader doesn't work with tomcat 6.0.35: Script url /api/upload;jsessionid=539E3E7730B9E7DF56C4A235F2592385 not map to a Web Script.
      34318: ALF-13163: Merged V3.4-BUG-FIX to V4.0
         34316: Method signature change to ConfigService fixes for RepoXMLConfigService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-01 16:21:10 +00:00
Neil McErlean
19c9d617a3 Some initial documentation on JUnit Rules samples.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-01 16:09:28 +00:00
Dave Ward
8521b7d7bd Merged V4.0-BUG-FIX to HEAD
34060: Merged V4.0 (4.0) to 4.0-BUG-FIX (4.0.1) <<< NOTE ALF-12939 still needs to be done to complete this merge to 4.0.1 >>>
      33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
       - Added dialect-specific script for SQL Server
      33059: Fix for ALF-12127, ALF-11161, ALF-11988
         Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
            33049: Fixed follow issues on THOR-839 & THOR-826
                   - Following webscripts now sets "Content-Type" response header to application/json
                   - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
      33060: Fix for ALF-12208 - group name encoding
      33072: Merge from HEAD to V4.0
         33071: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Fixed build failure in HeartBeat. It had relied on the fact that the previous LicenseComponent kept calling onLicenseChange every time
              the license was checked. It needed the check 1 minute after the initial bootstrap call as there was a memory model sync issue in the
              HeartBeat constructor to do with setting the URL it needed to call.
      33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
      33083: Merge from HEAD to V4.0
         33082: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Did not refresh Tortoise window, this file was missed in the last commit
         33080: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
               - On reflection decided to call onLicenseChange every time the license is checked.
                 A change of valid license would not have resulted in a call to onLicenseChange
                 Also have been able to make failure and success code more symmetrical.
               - The previous commit also added a RetryingTransaction around the sendData() call to
                 currentRepoDescriptorDAO.getLicenseKey() which I found while making the HeartBeat
                 changes. As a result we should no longer see the error in 4.0 about there not being a
                 transaction.
      33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
      33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
      Now handles null value
      33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
      - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
      33105: Bitrock license notice file.
      33114: Merged DEV to V4.0
         33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
      33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
      - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
      33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   34065: Fix for ALF-12708 (part 2)
     - Alfresco opencmis extensions library
   34093: ALF-10902 : CIFS: No friendly notification occurs when Editor or Collaborator tries to delete content
   34120: ALF-12767 : CIFS TextEdit - File has been modified outside TextEdit
   34125: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34094: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
       34095: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
              - caught incorrect exception - so much for reading the Java Doc :-)
              - build fix
   34138: ALF-564 : Is network-protocol-context.xml still useful ?
   34149: Removes more server side rendered dates:
   Fixes: ALF-12965, ALF-12984, ALF-12988.
   34158: Fix for ALF-12741 - Steck specific : error on managing groups
   34176: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34155: Fix for ALF-12979 CLONE - Search - searching in site without any images for *.jpg brings back all the documents
              - note this relies on wildcard/prefix/term/phrase all going through the phrase implementation for wildcard from ALF-12162
   34193: Fix for ALF-12205
   34196: Fix for ALF-12758
   34201: ALF-12892: Ensure that document permissions are refreshed in the dialog after being changed
   34214: Switched off the CIFS Kerberos ticket cracking code by default, added a config value to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK. 
   34215: Switched off the CIFS Kerberos ticket cracking code by default, added a property to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK (and OpenJDK, Oracle/Sun JVMs) 
   34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
      32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
      32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
   34220: Minor: follow-on to r34219 (ALF-11563)
   34226: ALF-12780:	Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file
   34228: ALF-12689: Fixed character encoding issue with dynamic welcome dashlet
   34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
   34240: ALF-12835: Second click in status box no longer clears status
   34241: ALF-11991: Updated DocLib to support categories
   34245: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34246: Reverse merge of BRANCHES/DEV/V4.0-BUG-FIX -c 34245
   Due to an 'svn commit' command argument ordering error, I checked in the solrcore.properties files. This reverse merge removes those changes.
   34247: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34249: ALF-12782 : IMAP - No friendly notification occurs when a user without delete permissions tries to delete content
   34254: Fix for ALF-13090 SOLR - cross tokenisation field matches too much for "*u*a"
   34262: Fixes: ALF-11557: Publishing Balloon popups appearing in wrong locations. Now appears in correct location in Doc Lib & replaced with standard popup message on Channel Admin page.
   34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - if orphaned nodes are identified (eg. via getPath(s)) then attempt partial recovery by placing them in (temp) lost_found
   - ... ALF-12358 ('child' node has deleted parent(s))
   - ... ALF-13066 (non-root 'child' node has no parent(s))
   - for internal use only - allows index tracking (eg. Solr) to continue
   - precursor to fixing underlying root causes
   - includes merge & extension of "testConcurrentLinkToDeletedNode" (from DEV/DEREK/ALF-12358)
   34298: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34068: Fix for ALF-342 - Entering a search containing a double quote displays pop-up 500 error in OpenSearch JSF component
      34069: Fix for ALF-342 - Completed fix with additional encoded of output HTML
      34070: Fix for ALF-12553 - Users are unable to see more than 100 sites under 'My Sites' page. List length now configurable.
      34080: Fix for ALF-10306 - Share Advanced search issue with the Date Range form values
      34107: Added missing jar lib to wcmquickstart and webeditor dependencies
      34114: Fix for ALF-10284 - User should be informed when user provides invalid credentials while opening document using link
      34151: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         34121: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4 (3.4.8)
            Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
            34100: ALF-12948 : Copyright year on "About Alfresco" page is out of date   
            Updated copyright year to 2012.
         34150: ALF-10976 (relates to ALF-10412)
            - Thumbnail mimetype check should have been >= 0 not > 0.   
      34171: ALF-13016 : TestModel class exits with a return code of 0 even if model fails validation.
      34190: A modifiable map that protects and underlying map from modification
       - When cloning the backing map (in the event of an potentially-modifying operation) keys and values
         are specifically checked for mutability to prevent excessive cloning.
       - Working towards fix for ALF-12855   
      34191: Fix ALF-12855: Improvement for Lucene in memory sorting and improvement for nodeService.getProperty()
       - Use ValueProtectingMap when passing values out of the NodeDAO
       - Solves the problem of map cloning when used internally as well as when calling NodeService.getProperty()
       - If client code retrieves immutable values from the properties, then they will not be cloned
       - TODO: Special handling of entrySet() and keySet() methods (see ALF-12868) to prevent interceptors from
               triggering map cloning
      34230: Fixes: ALF-12520. Adds i18n strings for siteModel
      34253: Fix for ALF-13102 - JBoss: Unathorized responce recieved on a wcs/touch request with clustered alfrescos (ntlm sso enabled).
      34272: ALF-13136 Merged V3.4.7 (3.4.7.5) to V3.4-BUG-FIX (3.4.9)
         34267: ALF-12419 "Garbage collector error" LockAcquisition on the OrphanReaper process
            - Modified OrphanReaper to use newer JobLockRefreshCallback.
              Refresh lock every minute and timeout if it takes longer than an hour.
      34281: ALF-13145: Merged PATCHES/V3.4.7 to V3.4-BUG-FIX
         34273: ALF-13112: Groups are not displayed when 60k sites and 60 groups in the system
            - Timeout adjustment approved by Kev and Erik
      34291: Merged V3.4 to V3.4-BUG-FIX
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.   
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
         - Fix by Alex Malinovsky
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers
      34292: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions
   34299: Merged V4.0 to V4.0-BUG-FIX
      34067: ALF-12423: Prevent script error on IE9
      34102: SPANISH: Fixes minor encoding error
      34115: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/V4.0:
         34099: ALF-12710: Stack specific: It's impossible to log into CMIS Workbench through WebServices binding
      34156: Missed from commit for r34154
      34189: Fix for ALF-12822 - Script error when Add translation
      34216: Fixes: ALF-11938 - A distinction needed making between the i18n labels for company address and personal address - I extended this to other company specific fields too.
      34238: ALF-12864: Removed trailing spaces from installed jodconverter defaults
      - Stopped forms from recognising booleans
      34243: NFS, switch from read-only to writeable file if write access required and cached file was opened read-only. ALF-12193.
      Fix I/O error saving from OpenOffice on Linux.
      34263: Merged HEAD to V4.0
         34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
      34264: ALF-12975: alfresco-enterprise-4.0.1-installer-win-x64.exe / x32 installers fail
      - Due to not detecting new stderr file
      34278: ALF-12763: Re-applied change from ALF-7528 after it was lost in r28224 / ALF-5900
         - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
   34303: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
         33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
      33320: Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
          33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
      33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
          33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
      33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
          33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
          33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
      33398: Merged V4.0-BUG-FIX to V4.0
         33116: ALF-12517: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
         33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
         33151: Fix problems with FTP and UTF-8. JLAN-81.
         When using the Java6 Normalizer use the NFC form.
         33158: Fix NFS server swallows exceptions. ALF-11667.
         Startup exception details are now saved.
         33183: Minor fix to exception string in extendBuffer().
      34061: Merged V4.0-BUG-FIX to V4.0 (Start of 4.0.1)
      34062: Merge V4.0-BUG-FIX to V4.0 RECORD ONLY (changes that came from V4.0)
      34109: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0
         34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
            Added missing jar lib to wcmquickstart and webeditor dependencies
      34154: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/V4.0:
         34149: Removes more server side rendered dates: Fixes: ALF-12965, ALF-12984, ALF-12988.
      34274: Merged V4.0-BUG-FIX to V4.0
         34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
      34288: Merged V3.4 to V4.0
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions   
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-01 11:41:07 +00:00
Neil McErlean
fae70e3cfb Upgrading JUnit lib to 4.10 to get full Rules support.
Initial Rule implementations being discussed at tomorrow's Brown Bag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-29 21:07:57 +00:00
Matt Ward
8dc24abf4b ALF-12866: WebDAV in-memory locking: configuration
* Improved configuration: config loaded from a Hazelcast XML config file.
* Config loading similar to JGroups, e.g. "protocol" substituted into config file name.
* Hazelcast instance no longer started unless the "alfresco.cluster.name" property is set.
* Current default member discovery protocol is UDP/multicast, however this is because
  this is the default set up shipped with Hazelcast - this is likely to change to TCP.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-29 13:45:45 +00:00
Andrew Hind
6e58fb9de0 Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD
34221: Test Fix: Avoid humerous deadlock with SQL Server - causing deadlock on dictionary initialisation from timestamp propagation - test hangs - may be a build fix ....


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-24 20:22:56 +00:00
Matt Ward
07dd8f3842 ALF-12866: remove repository's dependency on remote-api.
* A dependency of the repository project on the remote-api project had crept in.
* The dependency was stopping junit tests from being run in the Eclipse, since it does not define a dependency on remote-api by repository.




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-24 14:45:45 +00:00
Andrew Hind
2a932cda54 Merged BRANCHES\DEV\V4.0-BUG-FIX to HEAD
34203: Build fix - test affected by background update of parent timestamp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-23 18:04:18 +00:00
Alan Davis
bdc0214b79 Merged V4.0-BUG-FIX (4.0.2) to HEAD
34160: Merged V4.0 (V4.0.1) to V4.0-BUG-FIX (4.0.2)
      34159: ALF-12725,ALF-13011: Merge V3.4-BUG-FIX (3.4.9) to V4.0 (V4.0.1)
         34151: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
            34121: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4 (3.4.8)
               Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
               34100: ALF-12948 : Copyright year on "About Alfresco" page is out of date   
               Updated copyright year to 2012.
            34150: ALF-10976 (relates to ALF-10412)
               - Thumbnail mimetype check should have been >= 0 not > 0.
         
      
   


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-23 11:03:50 +00:00
Matt Ward
90326eb7e6 ALF-12866: WebDAV should use in-memory locking for transient locks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-22 15:28:47 +00:00
Andrew Hind
b7e992b9df Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD
34118: Possible Oracle Fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-21 14:23:08 +00:00
Matt Ward
bd38cc1fd8 Fixes database schema export test on MySQL/Linux.
* MySQL on Linux stores table names in a case-sensitive manner (due to case-sensitive filesys)
* DatabaseMetaData returns a confusing true for storesUppercaseQuotedIdentifiers, but seems not to be the case




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-21 13:57:21 +00:00
Matt Ward
594d581f71 Schemacomp - More logging to help diagnose broken test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-21 10:47:07 +00:00
Matt Ward
9c27f0f682 Added logging to ExportDbTest to help debug on bamboo.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-20 14:01:43 +00:00
Dave Ward
31872bfce7 ALF-12898: Fixed up merge
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-19 11:19:12 +00:00
Dave Ward
6f7095f450 Merged V4.0-BUG-FIX to HEAD
33935: ALF-12854: SOLR - requires more detailed tracking information
   - Part 1: info reported for the SOLR SUMMARY action
   33936: ALF-11693: Treat logging.properties the same way as log4j.properties and excluded it from the core .jar
   33945: ALF-12867: RIP jmx-dumper.jar
   33946: Fix minor issue introduced in r33920
   33947: IT-6847 "Error displays on recent 4.0 TS upgrade while navigate to a document details page"
   - errors spotted on folder details & in document library list also resolved by this fix
   33951: ALF-12867: Fixed typo
   33955: Some unit tests and examples on how to implement file wiping or shredding
    - One API change: On EagerContentStoreCleaner, the following is now protected:
         protected boolean deleteFromStore(String contentUrl, ContentStore store)
    - Examples in unit test ContentStoreCleanerTest: testForcedImmediateShredding and testShreddingCleanup
   33962: RIP hyperic plugin
   33965: ALF-12697: Asynchronously get RSS items for dashlets on page load
   33969: Fix for ALF-12307 Solr backup fills the disk
   - number to Keep can be set by property/subsystem/Share admin
   - set default backup localtion
   33970: Fix for ALF-12854 SOLR - requires more detailed tracking information
   Part 2: basic stats added to JMX and improved statistical moment calculation
   33984: Update 4.0.1 installers to use Tomcat 6.0.35
   - Remembered to set useHttpOnly on <Context>
   - Also commented out JreMemoryLeakPreventionListener
   33988: ALF-12717	CIFS: Unfriendly message occurs when a user with consumer/contributor role tries to rename space.
   33997: ALF-12697: Remove async WebScript from dashlet family
   33999: Fix for ALF-12854 SOLR - requires more detailed tracking information
   - Final part - Expose via share admin
   34005: Fix for ALF-12708
   34007: Merged V3.4-BUG-FIX (3.4.9) to 3.4-BUG-FIX (4.0.1)
      34006: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         34002: ALF-12898: MMT does not calculate the current version number correctly and does not report errors
            - ModuleManagementTool was constructing the wrong current war file version number.
              The minor and revision values were the wrong way around. 3.4.8 became 3.8.4
            - Modified unit test to use the actual version number in the test war 4.1.0 rather than 4.0.1
            - Modified the ModuleManagementTool so that problems would be reported to the user even if they did not have -verbose set
   34016: Update version.revision for 4.0.1
   34022: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33952: ALF-5680: It is possible to cut/paste a locked file   
      34003: Merged DEV to V3.4-BUG-FIX
         34001: ALF-12709: CLONE - Run action Wizard. Can't run action.
            Fixed regression connected with separator of AVM path in .NodeRef. id that has been changed from .;. to .|.
   34023: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33912: ALF-9899: Merged HEAD to V3.4-BUG-FIX (PARTIAL)
         31912: Merged DEV to HEAD
            31823: TransactionalCache provides REPEATABLE READ
                   - Values found in shared cache are placed into transactional cache
                   - Previously, values could keep changing until first write (READ COMMITTED)
                     but now the first read sets the value until it is changed by the current
                     transaction   
      33981: Updated version.revision for 3.4.9
      33985: ALF-12364: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         33984: Update 3.4.9 installers to use Tomcat 6.0.35
            - Remembered to set useHttpOnly on <Context>
            - Also commented out JreMemoryLeakPreventionListener


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-18 12:12:01 +00:00
Matt Ward
42f24b1c6a Disabled schema ref. file check - to be reenabled when reference files brought up to date.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-16 18:53:08 +00:00
Matt Ward
60c4c463a8 Messaging facade: Removed failing tests from automated build.
* Added suite that runs all the 'safe' tests.
* Modified old suite to run safe tests plus unsafe tests.
* build.xml includes the safe test suite only (BuildSafeTestSuite)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-16 11:55:22 +00:00
Dave Ward
a32ec35333 Merged V4.0-BUG-FIX to HEAD
33858: Fix for ALF-12674 CMIS LOWER fails with SOLR
   - also fixed ranges 
   - UPPER/LOWER only matches upper/lower case - they were doing a generic match
   33859: GERMAN: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33860: FRENCH: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33861: JAPANESE: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33862: DUTCH: L10N updates based on EN rev 33523. Fixes:
      - ALF-12510, ALF-12498, ALF-12496
      - ALF-12495, ALF-12483, ALF-12477 
      - ALF-12472, ALF-12471, ALF-12470
   33892: ALF-11746 Tweak mimetype description sorting to be explicitly by description, case insensitive
   33897: Fix for ALF-12789 XAM clean JOB fails with SOLR search
   - HTTPClient as used by SOLR now includes connection stale check
   33902: Changed FileInfo to use flags value for pseudo file and delete on close, so values are copied by copyFrom().
   33904: Fixes: ALF-12794; Unescaped content error in delete event dialogue.
   33910: ALF-12701: Ensure that all action labels are encoded to prevent XSS attacks
   33913: Strip oplock request bits for pseudo files in the NTCreateAndX CIFS processing, so oplocks never granted to pseudo files.
   33920: A better fix for ALF-12794.
   33929: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33871: ALF-12557: WCM - Webform file picker path doesn't take account of the current Webapp
      - Fix by Pavel
      33901: ALF-12815: Not possible to set versionType property when adding the aspect through nodeService.addAspect
      33909: Fix for NFS 'node does not exist' error when editing using vi. ALF-12712.
      33911: Merged V3.4 to V3.4-BUG-FIX
         33867: ALF-9899: Site creation time was still increasing linearly due to avm_child_entries queries not being able to use an index
         - Added new lc_name column - lower case version of the name which can be included in the primary key and queries
         - Added DB upgrade scripts
         33870: ALF-9899: Fixed indexing performance regression (e.g. during creation of 60,000 sites)
         - Apply more scoped cache invalidation for properties and aspects of a node in the current transaction, in line with parent associations
         - E.g. if I am querying aspects on a node already given a new parent association in the current transaction, there is no need to invalidate the parent assocs again when I find the aspects out of date!
         - This plus previous checkin means create site through Share UI back to 1 second (rather than 1 minute) with 30,000 sites
      33914: Merged V3.4 to V3.4-BUG-FIX
         33872: Merged V3.4-BUG-FIX to V3.4
            33843: Fix for ALF-12775
         33895: ALF-12816: Merged V4.0-BUG-FIX to 3.4
            33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax
         33900: MMT fix: When the war has no version.properties file  (e.g. share) it does not error.
            Added a test case and empty.war
      33915: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         33462: Merged V3.4-BUG-FIX to V3.4 (3.4.8)
         33896: ALF-9899: Reversed revisions 33867 and 33870 and rescheduled for 3.4 HF


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-15 17:22:40 +00:00
Alan Davis
ffb5aa8f40 ALF-12725: Merged V4.0-BUG-FIX (4.0.1) to HEAD
33889: ALF-12725: Merged V3.4-BUG-FIX (3.4.9) to V4.0-BUG-FIX (4.0.1)
      33888: Merged V3 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33887: ALF-10976 (relates to ALF-10412)
            - Fix build failures. Error in FailoverContentTransformer.isTransformable and FailoverContentTransformer.isTransformableSize
              which resulted in no mimetype checks if the size was negative which it was in ThumbnailServiceImplTest.testHTMLToImageAndSWF.
            - Commented out new unit tests in ContentServiceImplTest as OpenOffice is not on the build machines.
   


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-14 22:52:27 +00:00
Matt Ward
b85e786025 Messenger facade, a few miscellaneous bits
* more logging
* comments
* more tests



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33894 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-14 16:34:42 +00:00
Matt Ward
e40bd92c21 Messaging facade: finished changing jgroups heartbeating over to facade.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-14 12:27:57 +00:00
Gethin James
4f1d0adc4d FIXED : ALF-12777: MMT should not install AMPs which override pre-existing files in the war file, unless -force is provided
The MMT is moving toward more of a validation phase (checks things, calculate changes) then an execution phase (makes the changes).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-14 10:50:04 +00:00
Nick Burch
703e769bd8 Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
33863: ConfigSource for XMLConfigService which uses a ResourceFinder for wildcard-compatible lookups (UrlConfigSource does not support them)
   33864: ALF-10736 Make it easier to supply custom mimetypes, by automatically importing all files matching alfresco/extension/mimetype/*-map.xml, rather than having to override a bean to list them


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-13 17:15:59 +00:00
Dave Ward
c3a622e3c4 Merged V4.0-BUG-FIX to HEAD
33836: Fix for ALF-10651 Fix patches that trigger reindexing and ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock
   33842: Fixes ALF-12797: i18n strings in activiti-admin login-screen escaped properly
   33844: Fix for ALF-10651 Fix patches that trigger reindexing and ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock
   - batch touch to limit the in clause size generated
   33845: Manually added extra core Share extensions needed for the V4.0 Records Management module from the development branch.
   - Refactored JSON property decorators for the Document Library data webscripts
   - Document List banners (e.g. working copy) moved into metadata template config
   - Ability to override default document/folder title within Document Library (<title> element in metadata template - unused in core code)
   - Additional extension point in surf-doclist to override remote data URL
   - Better handling for missing content property
   33852: ALF-12725: Merged V3.4-BUG-FIX (3.4.9) to V4.0-BUG-FIX (4.0.1)
      33849: Merged V3 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33848: ALF-10976 (relates to ALF-10412)
            Fixed bug to do with preview being stuck as always being 'Content cannot be previewed.
            Do you wish to download?' or a 'blank preview after a transformer is not found' for all
            content with the same mimetype. Cache in ThumbnailRegistory.getThumbnailDefinitions()
            now understands that transformers may have an upper content size limit. The choice between
            the two options was based on the size of the first file previewed of each mimetype.
            Needed to add getMaxSourceSizeBytes() to support this (see below).
            - refactored (previous refactor was incomplete) ContentTransformer so that
              the two halfs of isTransformable is now split into sub methods
              isTransformableMimetypes and isTransformableSize.
              This is why there are so many files changed.
            - Moved getMaxSourceSizeBytes() from AbstractContentTransformerLimits to ContentTransformer as
              there were becomming too many places in the code that needed needed to check if the ContentTransformer
              was an instanceof AbstractContentTransformerLimits before calling this method.
            - TransformerDebug now uses KB MB GB values in output to make it simpler to read.
            - TransformerDebug now uses thousand separaters in millisecond values to make it simpler to read.
            - TransformerDebug now reports the 'parent' transformer name rather than the sub-transformer name 
              when an unavailable transformer is found. Makes it simpler to tie up with the 'available transformer'
              list with the new pushIsTransformableSize() calls.
            - TransformerDebug now uses trace logging for calls from ThumbnailRegistory.isThumbnailDefinitionAvailable()
              as it is normally followed by a ContentService.transform() which is logged at debug level anyway.
            - TransformerDebug now turns logging level to trace if the file size is 0 bytes. Request from Jan.
              Not sure how one uploads such a file!
            - Modified ComplexContentTransformer.isTransformable() so that it checks the mimetypes before the sizes
              so that TransformerDebug does not report 'unavailable transformers' that don't support the
              mimetype conversion.
            - Modified ComplexContentTransformer.getLimits and ComplexContentTransformer.isPageLimitSupported()
              to include the limits from the first sub transformer.
              Was not an issue until ContentTransformer.getMaxSourceSizeBytes() was introduced.
            - Added logger to RhinoScriptProcessor to debug requests run javascript on the server.
            - Dropped the sourceUrl parameter from ThumbnailRegistry.getThumbnailDefinitions() which was
              introduced with limits as it is logicall not needed.
   33853: DiskInterface.renameFile() can now throw PermissionDeniedException to return a different status to the client. Part of ALF-12717.
   33856: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33835: ALF-12546: Remove references to retired RegPaths.exe from installed apply_amps.bat script
      33843: Fix for ALF-12775
      33855: Merged V3.4 to V3.4-BUG-FIX
         33851: ALF-12588: Documents Intermittently Do Not Appear in Share
            - Fix by Alex Busel for regression I accidentally caused in 3.4.6
            - Simple typo in mergeDeletions() caused path deletions to sometimes not get applied or get processed twice
            - Yikes!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-13 12:24:24 +00:00
Matt Ward
ac387f5f7b Messenger facade: MessengerFactory.createMessenger() now takes app-region as parameter
* Allows single factory to be specified and individual consumers to use it to create appropriate application-region-scoped messengers.
* New interface more appropriate for where non-DI use will be required, e.g. Ehcache peer providers.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-13 11:08:20 +00:00
Matt Ward
b9cfc43929 Lengthened timeout on test to help avoid build errors.
I'm aware that timer-based tests are best avoided and will try to replace with something better if possible!



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-13 09:34:50 +00:00
Matt Ward
ada5b12a8f Messaging facade for clustered communications to allow implementations from JGroups or Hazelcast to be used.
* PropertyBackedBeanExporter uses the facade, configured with JGroups messaging implementation.
* Unfortunately, some remodelling required before this will work with Ehcache's CacheManagerPeerProviderFactory




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-10 17:07:41 +00:00
Dave Ward
4e7a0f6ef0 Merged V4.0-BUG-FIX to HEAD
33757: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX
      33755: Latest Spring Surf libs:
             - Updates to convert FreeMarker directives for processing directives Spring Beans to allow their behaviour to be customized.
             - Changed Extensibility model objects to use a non-blocking GUID generator to avoid thread contention (small amount noticed with 1000 concurrent user test)
             - Removed old machine gun code to generate Object GUIDs, which weren't even valid GUIDs ironically.
             - Replaced with new non-blocking fast GUID generator in webscripts package.
             - Added Reentrant ReadWriteLock around resources in singleton Spring beans that are manipulated by multiple threads.
             - Added Reentrant ReadWriteLock around Advanced Component internal resources.
             - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
             - Removed lock around ModelWriter (which is only used by a single request thread at a time)
             - Replaced StringBuffer with StringBuilder for Writer usage in extensibility framework to remove locking.
             - Performance improvements around retrieval of RemoteClient instance
             - avoid expensive Spring prototype bean retrieval, use a threadlocal clone of a base RemoteClient bean instead.
             - Concurrency fixes around CRUD operations on shared ModelObjects instances.
             - Surf ModelObjects are shared between all users in the model object caches - but the original machine gun code has no locking what-so-ever around CRUD operations - which meant that it was possible for incorrect property values to be received from a ModelObject in a heavily multi-threaded scenario on initialisation of a Surf application.
             - was causing nonsense warnings such as:
               WARN  [extensions.webscripts.WebTemplateProcessor] [http-8081-exec-10] Unable to find a valid template path for uri: freemarker
             - Modified default web-tier server response codes for read timeout and connect timeout to return more sensible codes to client browsers.
             - Fix for concurrency issue resolving SpringMVC View objects found during heavy thread testing on web-tier startup.
             - Improved caching strategy for WebScripts View Resolver - move techniques from Surf down to WebScripts layer.
             - Improved general View Resolver strategy by caching failed view requests.
             - WebScript resource bundle extension module application thread safety modifications   
   Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33684: Fixes for ALF-12628, ALF-12639 - timeout handling for READ_TIMEOUT from web-tier to Alfresco
   33771: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled
   33773: ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter to include only updateable properties at persistence and start up time
   33775: ALF-11870 Handle the odd way that Outlook requests yearly repeating events, and add unit tests for the yearly recurrence cases
   33776: ALF-12569: org.postgresql.util.PSQLException Invalid ESCAPE on customizing alfresco share site dashboard   
      Added backwards compatible PostgreSQL-specific ESCAPE fragment - fixes for PostgreSQL 9.1.2.
   33784: Fixes: ALF-12111 - Publishing Error when authenticating Facebook channels using IE8. Required an update to stand-alone-auth-return.html.
   33787: Fix for ALF-12337 Remove patch.siteLoadPatch.swsdp from being run for upgrades
   - only add the sample site for new installs and not upgrades
   33794: ITALIAN: Translation updates based on EN r33523
   33807: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33717: (RECORD ONLY) ALF-12632 Move the Site Service permissions to public-services-security-context.xml, to mirror the behaviour on 4.0, and add a (commented out) example of how to restrict site creation permissions with it
      33806: Merged V3.4 to V3.4-BUG-FIX
         33728: ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
            - Added configuration to limit older excel format 'xls' from Excel 5.0/95 and Excel 97-2003
              Already had configuration for xlsx Microsoft Office 2007
         33743: ALF-12724: Merge HEAD to V3.4 (3.4.8)
            Issue found while fixing ALF-9899 and again by QA when testing ALF-9899
            32941: ALF-11300:
              - fix locking issues
         33772: Merged DEV to V3.4
            33768: ALF-12685 : Search isn't working correctly
               Index delete events were not getting fired for the entire tree of affected nodes when a node was archive
               Added a deletion of child nodes from indexes in DbNodeServiceImpl.pullNodeChildrenToSameStore() method.
         33803: ALF-12724: Merged V4.0-BUG-FIX to V3.4 (Reverts previous revision and changes an error message to debug)
            33137: Activities feed generator: change info log messages to debug log messages
            33452: Fix for ALF-12536
            33536: Fix for ALF-12536: hopefully this will be the final fix.
         33805: ALF-12624: Fix regression introduced by ALF-9514


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-09 16:13:30 +00:00