Changes

Summary

1. merged trunk to feature branch as sync prior to reintegrating with trunk. Picked up the eml2.2 and ontology processors, as well as the eml-annotations subprocessor with additional solr schema funding fields. Tweaked additions to be compatible with SolrIndexServiceV2. Unit tests all passing locally.

Revision 19915 by rnahf: merged trunk to feature branch as sync prior to reintegrating with trunk.  Picked up the eml2.2 and ontology processors, as well as the eml-annotations subprocessor with additional solr schema funding fields.  Tweaked additions to be compatible with SolrIndexServiceV2. Unit tests all passing locally.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/branches/feature-indexing-no-hold-ores	.
	/software/cicore/branches/feature-indexing-no-hold-ores/pom.xml	pom.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorDaemon.java	src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorDaemon.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/annotation/OntologyModelService.java	src/main/java/org/dataone/cn/indexer/annotation/OntologyModelService.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.java	src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-annotator.xml	src/main/resources/application-context-annotator.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-eml-annotation.xml	src/main/resources/application-context-eml-annotation.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-eml-base.xml	src/main/resources/application-context-eml-base.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-eml220.xml	src/main/resources/application-context-eml220.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-ontology-model-service.xml	src/main/resources/application-context-ontology-model-service.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-solr-schema.xml	src/main/resources/application-context-solr-schema.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/index-context-file-includes.xml	src/main/resources/index-context-file-includes.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/index-parser-context.xml	src/main/resources/index-parser-context.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/index-solr-schema.xml	src/main/resources/index-solr-schema.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/ontologies	src/main/resources/ontologies
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java	src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessorTest.java	src/test/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessorTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessorTest.java	src/test/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessorTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/OntologyModelServiceTest.java	src/test/java/org/dataone/cn/indexer/annotation/OntologyModelServiceTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/SolrFieldEmlAnnotationTest.java	src/test/java/org/dataone/cn/indexer/annotation/SolrFieldEmlAnnotationTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.java	src/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java	src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/d1_testdocs/eml220	src/test/resources/org/dataone/cn/index/resources/d1_testdocs/eml220
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr/conf/schema-field-map.xml	src/test/resources/org/dataone/cn/index/resources/solr/conf/schema-field-map.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr/conf/schema.xml	src/test/resources/org/dataone/cn/index/resources/solr/conf/schema.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr4home/collection1/conf/schema.xml	src/test/resources/org/dataone/cn/index/resources/solr4home/collection1/conf/schema.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/schema.xml	src/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/schema.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/test-context.xml	src/test/resources/org/dataone/cn/index/test-context.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xml	src/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/indexer/solrhttp/test-solr-schema.xml	src/test/resources/org/dataone/cn/indexer/solrhttp/test-solr-schema.xml
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/configuration/index-processor.properties	src/test/resources/org/dataone/configuration/index-processor.properties
	/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/test-index-parser-context.xml	src/test/resources/test-index-parser-context.xml