Ray Gauss b0cd84dde7 ALF-17892: Should be Easier to Override Individual Mappings for Metadata Extractors ...

- Changed behavior of AbstractMappingMetadataExtracter.init to allow for specified mapping property entries to override the default entries rather than be merged with them
   - Added Javadoc notes to setInheritDefaultMapping and setInheritDefaultEmbedMapping indicating on the behavior
   - Changed MappingMetadataExtracterTest.testPropertyMappingMerge to reflect the new expected result
   - Added MappingMetadataExtracterTest.testPropertyMappingDisable to test disabling a mapping

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2013-02-22 19:30:50 +00:00

..

action

Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE - Admin Console 46247-46672

2013-02-15 11:44:53 +00:00

activities

More merge/test fallout ...

2013-02-14 12:13:40 +00:00

admin

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

attributes

…

audit

Merged V4.1-BUG-FIX to HEAD

2012-10-25 16:38:22 +00:00

avm

Merged V4.1-BUG-FIX to HEAD

2012-09-12 19:10:54 +00:00

batch

…

blog

Merged V4.1-BUG-FIX to HEAD

2012-10-25 16:38:22 +00:00

bulkimport

Merged V4.1-BUG-FIX to HEAD

2012-12-15 10:12:46 +00:00

cache

Merged V4.1-BUG-FIX to HEAD

2012-11-23 16:46:57 +00:00

calendar

Merged V4.1-BUG-FIX to HEAD

2012-08-14 19:17:45 +00:00

clt

…

coci

Merged V4.1-BUG-FIX to HEAD

2012-12-21 10:34:39 +00:00

config

Merged V4.1-BUG-FIX to HEAD

2012-08-10 08:35:06 +00:00

configuration

…

content

ALF-17892: Should be Easier to Override Individual Mappings for Metadata Extractors

2013-02-22 19:30:50 +00:00

copy

Merged V4.1-BUG-FIX to HEAD

2012-08-28 13:37:05 +00:00

deploy

BDE-73 BDE-78 Add more tests to compute coverage + fetch application context from classpath rather than file system

2012-07-18 08:46:03 +00:00

descriptor

Merged V4.1-BUG-FIX to HEAD

2012-08-28 13:37:05 +00:00

dictionary

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

discussion

Merged V4.1-BUG-FIX to HEAD

2012-10-28 11:02:01 +00:00

domain

ActivityService: minor template fix for unit tests

2013-02-15 18:40:11 +00:00

download

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

exporter

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

forms

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

forum

Use GUID naming for test folders and files

2011-10-18 11:28:50 +00:00

googledocs

Merged V4.1-BUG-FIX to HEAD

2012-10-21 18:11:58 +00:00

i18n

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

imap

Merged V4.1-BUG-FIX to HEAD

2012-11-23 16:46:57 +00:00

importer

Merged V4.1-BUG-FIX to HEAD

2012-12-13 14:16:40 +00:00

invitation

Merged V4.1-BUG-FIX to HEAD

2012-08-28 13:37:05 +00:00

jscript

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

2013-02-06 11:00:59 +00:00

links

ALF-11319 Work around the fact that Filtered Lucene Results don't support start/hasMore calls, so the new services using these for tag queries (links and discussion) need to handle that if the results were filtered

2011-11-21 17:35:59 +00:00

lock

Merged V4.1-BUG-FIX to HEAD

2012-12-21 10:34:39 +00:00

management

ALF-14306: Merged DEV to HEAD (4.2)

2013-02-18 14:31:46 +00:00

model

ALF-11698 Cifs needs to set hidden file attribute

2013-01-21 15:28:41 +00:00

module

Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE2 - Admin Console 46677:46774

2013-02-19 14:08:32 +00:00

node

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

2013-02-06 11:00:59 +00:00

nodelocator

…

notification

Additional test classes that allow for easier testing of Notifications (emails mostly).

2011-09-19 21:44:23 +00:00

oauth1

JDK7: Fix order in which test methods are executed, to make test pass

2012-09-26 15:15:40 +00:00

oauth2

Collapsed test methods to avoid ordering issues

2012-09-26 09:29:05 +00:00

ownable/impl

Merged V3.4-BUG-FIX to HEAD

2011-09-26 18:24:09 +00:00

policy

Merged V4.1-BUG-FIX to HEAD

2012-10-21 18:11:58 +00:00

preference

Improvement to fix and encapsulate the test for user writes to preferences. Also switched around the test so the fastest and most likely to succeed tests go first.

2012-09-21 09:42:16 +00:00

processor

ALF-11659: CLuster specific - Could not execute "Start Polled Review and Approve"script

2011-12-08 12:34:52 +00:00

publishing

Merged V4.1-BUG-FIX to HEAD

2012-12-21 10:34:39 +00:00

query

Merged V4.1-BUG-FIX to HEAD

2012-08-10 11:20:15 +00:00

quickshare

Merged BRANCHES/DEV/CLOUD1-BUG-FIX to HEAD:

2012-10-08 19:16:37 +00:00

rating

ALF-11318: Add policy to prevent copying of rateable aspect and associated aspects.

2012-05-31 14:53:01 +00:00

remote

Merged V4.1-BUG-FIX to HEAD

2012-08-22 09:27:02 +00:00

remoteconnector

Merged V4.1-BUG-FIX to HEAD

2012-12-15 10:12:46 +00:00

remotecredentials

Fix tests to clean up container after method execution

2012-09-26 09:57:33 +00:00

remoteticket

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

2012-10-01 12:17:53 +00:00

rendition

ALF-17766: ImageCropOptions Should be Refactored as TransformationSourceOptions

2013-02-05 01:13:53 +00:00

replication

Fix for ALF-11931

2011-12-20 11:57:22 +00:00

rule

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

2012-12-09 21:26:09 +00:00

scheduler

…

search

ALF-14306: Merged DEV to HEAD (4.2)

2013-02-16 07:40:55 +00:00

security

Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE - Admin Console 46247-46672

2013-02-15 11:44:53 +00:00

service

ALF-10967 Webdav content link is not usable in IMAP

2011-10-31 17:37:06 +00:00

shutdown

…

site

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

2013-02-06 11:00:59 +00:00

solr

Merged V4.1-BUG-FIX to HEAD

2012-11-23 16:46:57 +00:00

subscriptions

Fix failing unit tests

2012-10-28 10:57:36 +00:00

tagging

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

2013-02-06 11:00:59 +00:00

template

Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE - Admin Console 46247-46672

2013-02-15 11:44:53 +00:00

tenant

More merge/test fallout ...

2013-02-14 12:13:40 +00:00

thumbnail

Merged BRANCHES/DEV/RGAUSS/HEAD-SOURCE-TARGET-TRANS-OPTIONS to HEAD:

2013-01-30 20:32:55 +00:00

transaction

Merged BRANCHES/DEV/THOR1 to HEAD:

2013-02-13 09:42:13 +00:00

transfer

Merged V4.1-BUG-FIX to HEAD

2012-11-14 11:56:36 +00:00

urlshortening

…

usage

JDK7: re-enable disabled test methods, and make sure JUnit executes them in the order of the source file

2012-09-26 17:30:57 +00:00

version

Merged V4.1-BUG-FIX to HEAD

2012-12-15 10:12:46 +00:00

webdav

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

2012-10-01 12:17:53 +00:00

wiki

Merged V4.1-BUG-FIX to HEAD

2012-09-24 18:03:25 +00:00

workflow

Follow-on to r46551

2013-02-13 15:43:22 +00:00