inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
46383: ALF-17893: CLONE - Mappings for Metadata Extractors Should be Defined in Config
        - Added support for new alfresco/metadata location will preserving backwards compatibility with the old location
        - Added tests for support of properties in the new location, the old location, and that on missing properties the error thrown indicates the new location
        - Updated JavaDoc for new alfresco/metadata location


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46392 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ray Gauss
2013-02-07 17:36:51 +00:00
parent 4a291259ca
commit 0d2e386bcf
4 changed files with 122 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
View File

@@ -1534,10 +1534,12 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
* The default implementation looks for the default mapping file in the location
* given by the class name and <i>.properties</i>. If the extracter's class is
* <b>x.y.z.MyExtracter</b> then the default properties will be picked up at
* <b>classpath:/x/y/z/MyExtracter.properties</b>.
* <b>classpath:/alfresco/metadata/MyExtracter.properties</b>.
* The previous location of <b>classpath:/x/y/z/MyExtracter.properties</b> is
* still supported but may be removed in a future release.
* Inner classes are supported, but the '$' in the class name is replaced with '-', so
* default properties for <b>x.y.z.MyStuff$MyExtracter</b> will be located using
* <b>x.y.z.MyStuff-MyExtracter.properties</b>.
* <b>classpath:/alfresco/metadata/MyStuff-MyExtracter.properties</b>.
* <p>
* The default mapping implementation should include thorough Javadocs so that the
* system administrators can accurately determine how to best enhance or override the
@@ -1560,15 +1562,42 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
*/
protected Map<String, Set<QName>> getDefaultMapping()
{
String className = this.getClass().getName();
// Replace $
className = className.replace('$', '-');
// Replace .
className = className.replace('.', '/');
// Append .properties
String propertiesUrl = className + ".properties";
// Attempt to load the properties
return readMappingProperties(propertiesUrl);
AlfrescoRuntimeException metadataLocationReadException = null;
try
{
// Can't use getSimpleName here because we lose inner class $ processing
String className = this.getClass().getName();
String shortClassName = className.split("\\.")[className.split("\\.").length - 1];
// Replace $
shortClassName = shortClassName.replace('$', '-');
// Append .properties
String metadataPropertiesUrl = "alfresco/metadata/" + shortClassName + ".properties";
// Attempt to load the properties
return readMappingProperties(metadataPropertiesUrl);
}
catch (AlfrescoRuntimeException e)
{
// We'll save this to throw at someone later
metadataLocationReadException = e;
}
// Try package location
try
{
String canonicalClassName = this.getClass().getName();
// Replace $
canonicalClassName = canonicalClassName.replace('$', '-');
// Replace .
canonicalClassName = canonicalClassName.replace('.', '/');
// Append .properties
String packagePropertiesUrl = canonicalClassName + ".properties";
// Attempt to load the properties
return readMappingProperties(packagePropertiesUrl);
}
catch (AlfrescoRuntimeException e)
{
// Not found in either location, but we want to throw the error for the new metadata location
throw metadataLocationReadException;
}
}
/**