UnstableChanges

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 TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores.
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/pom.xmlpom.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorDaemon.javasrc/main/java/org/dataone/cn/index/processor/IndexTaskProcessorDaemon.java
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.javasrc/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.javasrc/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/annotation/OntologyModelService.javasrc/main/java/org/dataone/cn/indexer/annotation/OntologyModelService.java
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.javasrc/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.java
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-annotator.xmlsrc/main/resources/application-context-annotator.xml
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-eml-annotation.xmlsrc/main/resources/application-context-eml-annotation.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-eml-base.xmlsrc/main/resources/application-context-eml-base.xml
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-eml220.xmlsrc/main/resources/application-context-eml220.xml
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-ontology-model-service.xmlsrc/main/resources/application-context-ontology-model-service.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/application-context-solr-schema.xmlsrc/main/resources/application-context-solr-schema.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/index-context-file-includes.xmlsrc/main/resources/index-context-file-includes.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/index-parser-context.xmlsrc/main/resources/index-parser-context.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/index-solr-schema.xmlsrc/main/resources/index-solr-schema.xml
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/main/resources/ontologiessrc/main/resources/ontologies
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.javasrc/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessorTest.javasrc/test/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessorTest.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessorTest.javasrc/test/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessorTest.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/OntologyModelServiceTest.javasrc/test/java/org/dataone/cn/indexer/annotation/OntologyModelServiceTest.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/SolrFieldEmlAnnotationTest.javasrc/test/java/org/dataone/cn/indexer/annotation/SolrFieldEmlAnnotationTest.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.javasrc/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.java
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.javasrc/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java
The file was added/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/d1_testdocs/eml220src/test/resources/org/dataone/cn/index/resources/d1_testdocs/eml220
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr/conf/schema-field-map.xmlsrc/test/resources/org/dataone/cn/index/resources/solr/conf/schema-field-map.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr/conf/schema.xmlsrc/test/resources/org/dataone/cn/index/resources/solr/conf/schema.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr4home/collection1/conf/schema.xmlsrc/test/resources/org/dataone/cn/index/resources/solr4home/collection1/conf/schema.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/schema.xmlsrc/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/schema.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/index/test-context.xmlsrc/test/resources/org/dataone/cn/index/test-context.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xmlsrc/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/cn/indexer/solrhttp/test-solr-schema.xmlsrc/test/resources/org/dataone/cn/indexer/solrhttp/test-solr-schema.xml
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/org/dataone/configuration/index-processor.propertiessrc/test/resources/org/dataone/configuration/index-processor.properties
The file was modified/software/cicore/branches/feature-indexing-no-hold-ores/src/test/resources/test-index-parser-context.xmlsrc/test/resources/test-index-parser-context.xml