Metacat

added 4 new schema fields so need to account for them in the test case.

bump trunk to 2.6.0-SNAPSHOT and pull in d1 dependencies at 2.1.0-SNAPSHOT to continue trunk development.

add fileName, mediaType and mediaTypeProperties to solr schema and v2 system metadata processor

include seriesId in solr schema and context file (v2 system metadata)

fix compilation error for previous change: include isPublic criteria when there is a public subject (which is always).

include isPublic criteria when there is a public subject (which is always)

Change the schema test according the change on the schema itself.

merge CN solr schema to metacat (MN) to support prov and semantic index fields.

Change the number of the schema feilds.

add annotation, orcid and orgin_combined fields to the index schema