227 Commits

Author SHA1 Message Date
Neil McErlean
de612572d9 Proper fix for unreported issue with OOo-based extraction of Office 07 metadata.
Added a new metadata extractor based on POI for docx, xlsx and pptx mime types.
Changed OpenOfficeMetadataExtracter so that it no longer supports these mime types.
Added the new test code to ContentMinimalContextTestSuite

Some tidying up of code in AbstractMetadataExtracterTest and OpenOfficeMetadataExtracter to reflect the fact that this extractor does not handle these mime types any more.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-09 12:10:06 +00:00
Neil McErlean
4fdfac66da Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-09 09:48:14 +00:00
Neil McErlean
fad02fa135 Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.

I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-09 09:39:35 +00:00
Neil McErlean
b1f48c9747 Fixing test failures on HEAD. OOo is returning null values for pptx, xlsx properties author, title, description.
So these checks have been suspended. Will examine use of Poi to extract these properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-08 16:01:26 +00:00
Derek Hulley
f27434f2c6 Merged BRANCHES/V3.2 to HEAD:
19177: (RECORD ONLY) Updated record-only entries for V3.1 branch
   19321: (RECORD ONLY) Removed deep svn:mergeinfo
   19331: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
        19324: Follow-up on ALF-765 by upgrading EHCache to 2.0.0Performing merge across the whole of the branch
   19526: Moved ContentServicePolicy static QNames onto policy classes
   19539: (RECORD ONLY) Merged HEAD to V3.2
         19538: Build fix - fix build speed
   19541: Added extraction of custom, mapped metadata from PDF documents
   19543: (RECORD ONLY) Removed deep svn:mergeinfo
   19598: (RECORD ONLY) Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes
   19626: Fix for ALF-732:  Possible memory leak using the .getNodeRefs() method against a ResultSet ...
   19629: (RECORD ONLY) Merged HEAD to V3.2
        19625: Fix to allow Share logo to swapped out for a different one without having to modify the header CSS.
        19628: Corrected Share header component height.
   19649: ALF-885: Cannot retrieve cm:title from an AVM node in FreeMarker (if persisted with actual type set to MLText)
   19694: (RECORD ONLY) Merged V3.2 to HEAD: r19310 bad back merge - record-only
   19713: (RECORD ONLY) Removed svn:mergeinfo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-01 01:05:03 +00:00
Neil McErlean
f11ce22967 Return value from isTransformationBlocked was inverted. Fixed now.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-31 16:37:01 +00:00
Neil McErlean
fcc149147f Refinement of previous check-in re OOo transformations.
I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-31 15:25:57 +00:00
Neil McErlean
7daa5141b6 Fix for HEAD builds running on panda build server.
OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-31 15:07:29 +00:00
Roy Wetherall
28f113a0a3 Merge V3.2 to HEAD
19453: Merged BRANCHES/DEV/BELARUS/V3.2-2010_03_17 to BRANCHES/V3.2: 
      19407: ALF-254: empty files (0 bytes) do not trigger content rules 
         - Some Javadoc cleanup added    
   19601: Follow-up fix for ALF-254: Empty files (0 bytes) do not trigger content rules 
      - CIFS uses 'sys:noContent' instead of 'sys:temporary'; the latter has other behaviour attached



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-29 13:27:36 +00:00
Kevin Roast
c2ddf8dc14 Fix for ALF-2118:
- Added new method to MimetypeService to retrieve a valid mimetype given any extension, handling case and missing values
 - Updated JUnit tests for MimetypeService methods
 - Fixed callers of MimetypeService to use new method to protect against varying case of file extensions (ALF-2118 root cause)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-19 14:45:29 +00:00
Kevin Roast
1c897ae1fb Latest SpringSurf libraries:
- Cleanup and improvements to RequestContext related classes.
 - Removal of obsolete Alfresco util classes.
Fixed up imports back to Alfresco versions of unused SpringSurf util classes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-16 19:06:54 +00:00
Mark Rogers
03d130e99c ALF-2031 - DR and VT can't start
- undeleted and reinstated use of org.alfresco.util.Pair
   - undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
   - undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-16 15:05:47 +00:00
Nick Burch
a974734210 Merged V3.2 to HEAD
19285: Merged V3.1 to V3.2
    19283: Merged Belarus to V3.1
      18815: ETHREEOH-4225: Remove dependancy on third party jars odf-util, woodstox and jug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-15 13:00:09 +00:00
Derek Hulley
fdc8f6f331 Merged BRANCHES/V3.2 to HEAD:
18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
   19091: Fix Part 1 ALF-726: v3.1.x Content Cleaner Job needs to be ported to v3.2
   19159: Fixed ALF-726: Migrate pre-3.2 content URLs to new format and pick up tag existing orphaned content
   19169: Fix fallout from 19159 for ALF-726: Migrate pre-3.2 content URLs to new format and pick up tag existing orphaned content
   19262: ALF-726 Multithreading for content URL conversion



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-12 19:11:12 +00:00
Derek Hulley
7a18e7e52b Removed svn:executable tag
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-09 00:39:21 +00:00
Nick Burch
21b6c8cf10 Tweak the minimal context to hopefully work on the build machine too, and then re-enable tests + combine one suite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-08 14:23:51 +00:00
Neil McErlean
bce28a5599 Merging DEV_TEMPORARY to HEAD (RenditionService)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-05 20:02:52 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Nick Burch
94af793cd7 The content metadata and transform packages have their own test suites, with their own minimal contexts, so don't duplicate them in the main context
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-26 17:07:52 +00:00
Nick Burch
0919d25ce9 Improve how the Metadata and Content Transform tests request their contexts, to make it possible for them to run on the smaller context
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18853 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-25 16:49:48 +00:00
Nick Burch
c347025bae Improve the Mail metadata extractor test with more checks, and add a general metadata 'did we get something back' check to fail earlier with a more helpful error message. Also added an Array -> Collection TypeConverter that was missing from an early branch port
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-18 12:41:51 +00:00
Nick Burch
fe806bcab6 Make it possible to request that the ApplicationContext disables "autoStart=true" services for when running unit tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-09 16:47:03 +00:00
Nick Burch
bd1e3edf76 Update metadata extractors - Outlook, MP3, Mail and PDF improvements, and increase test coverage
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-04 14:42:45 +00:00
Roy Wetherall
41e574f3d5 Merge V3.2 To HEAD
17894 : Merge from NEILM to V3.2



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-21 17:48:10 +00:00
Derek Hulley
5e86299377 Merged V3.2 to HEAD
17620: Merged DEV_TEMPORARY to V3.2
      17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type
   17634: Put back AVM concurrency checks (reverse r17405)
   17644: Fixed up some comments and added return value to in-txn recording of deleted nodes
   17647: Fixed read-only detection of ContentStoreCleaner
   17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes
   17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL
   17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster)
   17658: Removed failing concurrency test for split person cleanup
   17659: Merged V3.1 to V3.2
      17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
             Fixes ETHREEOH-3606 (same as CHK-10454)
   17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536
   17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap)
   17678: Follow-on to r17666 (for RM custom model)
   17685: Merged DEV_TEMPORARY to V3.2
      17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed
   17695: Temporarily comment-out testSubmitChangedAssets1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599
   Merged /alfresco/BRANCHES/V3.1:r17308
   Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-20 11:30:46 +00:00
Derek Hulley
f89af49875 Merged V3.2 to HEAD
17574: Merged in DEV work for ContentStoreCleaner: ETHREEOH-2813
      17432: Build up for fix of ETHREEOH-2813: ContentStoreCleaner doesn't scale
      17546: ContentStoreCleaner fixes and further tests
      17524: Unit tests and bulk queries for orphaned content
      17506: W.I.P. for content cleaner for V3.2: ETHREEOH-2813
   17575: Missed check-in (other DB create scripts look OK)
   17577: Re-activated 'contentStoreCleanerTrigger'
          - Added system property: system.content.orphanCleanup.cronExpression=0 0 4 * * ?
          - Other useful properties:
              system.content.eagerOrphanCleanup=false
              system.content.orphanProtectDays=14
   17578: Fixed MT test and sample contexts after recent content cleaner changes
   17579: Fixed DB2 unique index creation for content URLs
   17580: First pass at fix for ETHREEOH-3454: Port enterprise upgrade scripts for ContentStoreCleaner changes
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17574-17575,17577-17580


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 15:26:46 +00:00
Derek Hulley
a650eb2a1c Merged V3.2 to HEAD
17502: Merged V3.1 to V3.2 (Fixes ETHREEOH-3155 & ETHREEOH-2653)
      17501: Merged V2.2 to V3.1
         17358: Improved debugging in Schema2XForms utility to help with resolving of repeating switch support for ETWOTWO-490
         17488: Fix for ETWOTWO-1006: xforms.js DEBUG output can cause performance issues with web forms
         17491: More XForms debugging improvements
   17503: Failover content transformer
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V2.2:r17358,17488,17491
   Merged /alfresco/BRANCHES/V3.1:r17501
   Merged /alfresco/BRANCHES/V3.2:r17502-17503


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 14:51:40 +00:00
Kevin Roast
a1ac5105a6 Merged V3.2E to HEAD
17385: Minor performance tweaks and code cleanup/consolidation in SiteServiceImpl.
   17386: ETHREEOH-3066 Added supporting logging
   17387: Minor javadoc updates pertinent to the FreeMarker API chapter updates.
   17392: Fix to unreported issue in User Profile where a recent fix incorrectly encoding javascript values as ?html.
      - values passed into JS components in FreeMarker template should use ?js_string operator - not the ?html operator.
   17399: ETHREEOH-3269, ETHREEOH-3271 - Dropdown markup changed for keyboard access
   17400: ETHREEOH-3278 - Navigator is very wide
   17401: Concatenate DocLib JavaScript files

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 11:11:39 +00:00
Derek Hulley
e2fbd4a8de Merged V3.2 to HEAD
17294: Fix for ETHREEOH-3194 - It's impossible to find Blogs and Discussions by title.
   17301: Activity Service fixes (ETHREEOH-1362 & ETHREEOH-1741)
   17302: Fix for ETHREEOH-2849 JPG to GIF transformation fails when using imagemagick cmd line options listed in our wiki
   17305: AVM - fix AVMStoreDescriptor ( creator/createDate) returned by getStores
   17306: Fix for ETHREEOH-1578 - Incorrect behavior of Calendar in Month view ...
   17318: Merged V3.1 to V3.2
      17317: Fix for ETHREEOH-3236 It is impossible to change start location, everything is reverted to My Alfresco
   17320: Merged V3.1 to V3.2
      17287 - Fix for ETHREEOH-110- It is impossible to browse events by tags
   17326: iBatis mapping fixes for AVM on Oracle (including ETHREEOH-3205)
   17327: Merged V3.1 to V3.2
      17324: Fix for ETHREEOH-2723 Script error appears when trying to edit Home Space Name for user
   17329: Merged V3.1 to V3.2
      17180: Merged V2.2 to V3.1
         17164: Fixes for deletion of large hierarchies: (ETHREEOH-2161 and ETHREEOH-2650)
         17179: (RECORD ONLY) Merged V3.1 to V2.2 ...
   17330: Fix for SiteActivityTest failure (caused by earlier -ve test data)
   17331: Merged V3.1 to V3.2
      17190: Further fixes for ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied)
      17207: Fix fallout from work on ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied)
      17215: Added back firing of policies for archive stores
   17351: Build fix check in to DBNodeService.    Will be followed by full fix when available.
   17353: Applied TransactionListenerAdapter
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /alfresco/BRANCHES/V3.1:r13091
   Merged /alfresco/BRANCHES/V2.2:r13089,13091,14190-14191,14199,14210,14216,14229,14655,14825,14869,17164,17179
   Merged /alfresco/BRANCHES/V3.1:r17180,17190,17207,17215,17287,17317,17324
   Merged /alfresco/BRANCHES/V3.2:r17294,17301-17302,17305-17306,17318,17320,17326-17327,17329-17331,17351,17353


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-15 11:09:09 +00:00
Kevin Roast
b726c4d6db Merged DEV/TEMPORARY to HEAD
17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-12-14 13:41:05 +00:00
Dave Ward
be0482f06e Integrated Spring v3 snapshot CI-477
- Fixes SPR-6411 and SPR-6412
- Removes dependency on Hibernate v3.3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-30 09:36:40 +00:00
Dave Ward
1a481a63c2 Merged BRANCHES/DEV/DAVEW/SPRING3 to HEAD
15422: Fix deploy-virtual-tomcat macro for Spring 3
   15391: Fix ContentStoreReplicatorTest for Spring 3
   15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
   15385: Correction to previous checkin
   15384: Fix ClassPathStore.createRelative() to work with Spring 3
      - Relative resource path resolution with directory resources has changed
   15346: Merged V3.3_SPRING3 to SPRING3
      15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
         - Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
      15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
      15308: Fix IBATIS integration to be compatible with Spring 3
      15307: Added missing runtime dependencies
         - org.springframework.expression-3.0.0.RC2.jar
         - org.springframework.asm-3.0.0.RC2.jar
      15289: Move Alfresco stack to Spring 3
         - Stage 1: get it compiling in eclipse and update ant scripts
         - Still requires Web Framework contributions from Uzi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-23 20:20:06 +00:00
Jan Vonka
de87ed5ffa Merged V3.2 to HEAD
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
2009-10-19 14:07:57 +00:00
Neil McErlean
0e9e98d6cd Merge 3.2 to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-16 13:24:22 +00:00
Derek Hulley
2dd348a281 Merged V3.2 to HEAD
15897: Merged V3.1 to V3.2
      14485: (RECORD ONLY) ETHREEOH-1937
      14915: (RECORD ONLY) Fix for ETHREEOH-2011: chaining-authentication-context.xml.sample
      14954: (RECORD ONLY) Fix merge error
      14966: (RECORD ONLY) Merged V2.2 to V3.1
         14131: *RECORD ONLY*
         14605: Merged HEAD to V2.2 (workaround for ETWOTWO-1137)
            14368: Fix for ETHREEOH-1936
         14607: Fixed NPE in TextMiningContentTransformer: Lead-up to fix for ETWOTWO-1174
      14992: (RECORD ONLY) Updated svn:mergeinfo for V2.1-A
      15080: Applied suggested fix for ETHREEOH-2252: Emailed content created in wrong space
      15131: Merged V2.1-A to V3.1 (ETHREEOH-2270)
         13465: Fix for ADB-161 ACT 7870 - added 'xsd' to mimetype map.
      15134: Merged V2.2 to V3.1
         14332: (RECORD-ONLY)
         14717: (RECORD-ONLY)
         14745: (RECORD-ONLY)
         14746: Fixed error relating to detection and clean-up of duplicate child associations
         14759: Missed check-in: Set transactionService for post-transaction duplicate child assoc cleanup
         14761: (RECORD-ONLY)
         14885: (RECORD-ONLY)
         14893: (RECORD-ONLY)
         14903: (RECORD-ONLY)
      15204: Fixed ETHREEOH-2303: FixNameCrcValuesPatch throws ConstraintViolationException during upgrade ...
      15214: Fixed ETHREEOH-1861: Offline synchronization updates file content without any changes
      15271: Applied patch fix: Imported users don't conform to case-sensitivity switch
      15352: ETHREEOH-2322
      15361: ETHREEOH-1112
      15369: ETHREEOH-2448
      15419: ETHREEOH-2479
      15431: ETHREEOH-2520 and ETHREEOH-2521
      15587: (RECORD ONLY) Moved Enterprise-only scripts to correct location
      15616: Fix ETHREEOH-2581 - WCM layered folder - can't submit deleted file
      15675: WCM fixes (ETHREEOH-2110 & ETHREEOH-2645)
      15836: Check for null username in ContentUsage service getUserUsage() method
      15840: (RECORD ONLY) Merged V3.2 to V3.1
         14760: Fix for ALFCOM-586 - trims and ignores leading/trailing whitespace before validation in JSF client forms.
      15841: Fixes for ETHREEOH-2702 and ETHREEOH-2687
      15860: (RECORD ONLY) Added Oracle and MS SQL Server config
      15891: Removed unused compiler directive
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/ETHREEOH-2221:r14753
   Merged /alfresco/BRANCHES/V2.1-A: lots
   Merged /alfresco/BRANCHES/V2.2:r14131,14332,14605,14607,14717,14745-14746,14759,14761,14885,14893,14903
   Merged /alfresco/BRANCHES/V3.1:r14485,14915,14954,14966,14992,15080,15131,15134,15204,15214,15271,15352,15361,15369,15419,15431,15587,15616,15675,15818,15836,15840-15841,15860,15891
   Merged /alfresco/BRANCHES/V3.2:r15897


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-13 20:08:41 +00:00
Neil McErlean
34b82892b5 Merged V3.2 to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16875 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-13 15:00:03 +00:00
Derek Hulley
b8b6c2785e Merged V3.2 to HEAD
15608: Merged V3.1 to V3.2
      14111: MT - fix ETHREEOH-914 (tenant domain mismatch in getting workflow pooled tasks)
      14855: MT - minor fix to result set (for tenant-based parent nodeRef)
      14865: MT - continuation fix for ETHREEOH-210 (Lucene search with QNAME)
      15108: Fix ETHREEOH-2014 - custom folder's children disappear after full re-index (MT w/ dynamic model)
      15146: Fix ETHREEOH-2452 - Cluster & MT: "Unable to find a writer. 'selectWriteStore' may not return null" ...                         
   15610: Merged V3.1 to V3.2
      15175: Cont ... fixup merge (delete file)
   16308: ETHREEOH-2833: The Content rule with 'Items with specific text value in property' condition can't be created.
   16334: (record only) Undo change of version.properties
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.1:r14111,14855,14865,15108,15146
   Merged /alfresco/BRANCHES/V3.2:r15608,15610,16308,16334


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-13 14:02:05 +00:00
Derek Hulley
1278771931 Merged V3.2 to HEAD
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
2009-10-13 10:57:47 +00:00
Mark Rogers
0a36194042 MOB-1512 - Date field processing for metadata extraction.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16458 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-23 12:48:41 +00:00
Gavin Cornwell
d28ac37351 - MOB-1259: Audit REST API: Added skeleton implementation for 'file audit log as record' action to allow Lawrence to implement the UI and have a service to call. URL is /api/rma/admin/rmauditlog, a JSON structure needs to be POSTed representing the destination for the record and the parameters for the audit log.
- All audit log URLs now need admin authentication
- Added 'event' parameter to audit trail, allows audit log to be restricted by event (not wired up yet though)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-09 10:36:17 +00:00
Jan Vonka
c2cca0311b AVM DAO refactor
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-08 09:55:22 +00:00
Mark Rogers
804e9bf091 Bug fixes for RM Constraint Lists
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-03 15:15:23 +00:00
Mark Rogers
49cb56a412 RM custom imap metadata extracter config functionality
- rest bindings working
 - should be sufficient functionaility to make progress on UI development
 - custom properties are not yet persisted anywhere

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-26 17:39:58 +00:00
Derek Hulley
acaaa39e23 Added the default mappings to the Javadoc for RFC822
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-10 12:46:33 +00:00
Mark Rogers
ab245dbced MERGE /DEV/BELARUS/IMAP_PE to HEAD
15125 - Imap property extraction

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-07-10 14:37:18 +00:00
Derek Hulley
4abdae701d Fix up packaging and samples
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-30 15:28:21 +00:00
Derek Hulley
e622af0425 Fixed MailMetadataExtractor after recent switch of .msg mimetype
- Added unit test for extractor
 - TODO: Add unit test to ContentTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-30 15:06:29 +00:00
Derek Hulley
f3bbea2f18 Fixed MailContentTransformerTest after Mimetype mapping changes
- rfc822 is now .eml
 - application/vnd.ms-outlook is now .msg


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-29 13:24:58 +00:00
Derek Hulley
5500f162b4 Merge IMAP in
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-26 08:48:25 +00:00