Changes

Summary

1. reintegrating feature-indexing-no-hold-ores branch to trunk (after pre-syncing that branch with trunk and testing)
2. Double the waiting time.
3. Add a more thread sleeping time in order to let the index finish.
4. Make the class public again.
5. Merge the 2.3 branch back to trunk after releasing CCI 2.3.18.

Revision 19922 by rnahf: reintegrating feature-indexing-no-hold-ores branch to trunk (after pre-syncing that branch with trunk and testing)
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_index_processor	.
	/software/cicore/trunk/cn/d1_cn_index_processor/README	README
	/software/cicore/trunk/cn/d1_cn_index_processor/pom.xml	pom.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessor.java	src/main/java/org/dataone/cn/index/processor/IndexTaskProcessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorRefactorReadinessPartial.java	src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorRefactorReadinessPartial.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskUpdateProcessor.java	src/main/java/org/dataone/cn/index/processor/IndexTaskUpdateProcessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexVisibilityDelegateHazelcastImpl.java	src/main/java/org/dataone/cn/index/processor/IndexVisibilityDelegateHazelcastImpl.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/QueuePrioritizer.java	src/main/java/org/dataone/cn/index/processor/QueuePrioritizer.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/AbstractStubMergingSubprocessor.java	src/main/java/org/dataone/cn/indexer/AbstractStubMergingSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/D1IndexerSolrClient.java	src/main/java/org/dataone/cn/indexer/D1IndexerSolrClient.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/SolrIndexService.java	src/main/java/org/dataone/cn/indexer/SolrIndexService.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/SolrIndexServiceV2.java	src/main/java/org/dataone/cn/indexer/SolrIndexServiceV2.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/RdfXmlSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/RdfXmlSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/BaseDocumentDeleteSubprocessor.java	src/main/java/org/dataone/cn/indexer/parser/BaseDocumentDeleteSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/BaseXPathDocumentSubprocessor.java	src/main/java/org/dataone/cn/indexer/parser/BaseXPathDocumentSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/IDocumentSubprocessorV2.java	src/main/java/org/dataone/cn/indexer/parser/IDocumentSubprocessorV2.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessor.java	src/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessorV2.java	src/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessorV2.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/ScienceMetadataDocumentSubprocessor.java	src/main/java/org/dataone/cn/indexer/parser/ScienceMetadataDocumentSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/UpdateAssembler.java	src/main/java/org/dataone/cn/indexer/parser/UpdateAssembler.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/utility/LeafElement.java	src/main/java/org/dataone/cn/indexer/parser/utility/LeafElement.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/utility/RootElement.java	src/main/java/org/dataone/cn/indexer/parser/utility/RootElement.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/HTTPService.java	src/main/java/org/dataone/cn/indexer/solrhttp/HTTPService.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrDoc.java	src/main/java/org/dataone/cn/indexer/solrhttp/SolrDoc.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementField.java	src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementField.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrJClient.java	src/main/java/org/dataone/cn/indexer/solrhttp/SolrJClient.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrSchema.java	src/main/java/org/dataone/cn/indexer/solrhttp/SolrSchema.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-resourcemap.xml	src/main/resources/application-context-resourcemap.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-solr-schema.xml	src/main/resources/application-context-solr-schema.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-systemmeta200.xml	src/main/resources/application-context-systemmeta200.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-parser-context.xml	src/main/resources/index-parser-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-solr-schema.xml	src/main/resources/index-solr-schema.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index_processor.properties	src/main/resources/index_processor.properties
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/indexer-solr-client-context.xml	src/main/resources/indexer-solr-client-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/org/dataone/configuration/index-processor.properties	src/main/resources/org/dataone/configuration/index-processor.properties
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/BaseSolrFieldXPathTest.java	src/test/java/org/dataone/cn/index/BaseSolrFieldXPathTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/DataONESolrJettyTestBase.java	src/test/java/org/dataone/cn/index/DataONESolrJettyTestBase.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldDataCiteTest.java	src/test/java/org/dataone/cn/index/SolrFieldDataCiteTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldDublinCoreOAITest.java	src/test/java/org/dataone/cn/index/SolrFieldDublinCoreOAITest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldDublinCoreTest.java	src/test/java/org/dataone/cn/index/SolrFieldDublinCoreTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldIsotc211Test.java	src/test/java/org/dataone/cn/index/SolrFieldIsotc211Test.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathDryad31Test.java	src/test/java/org/dataone/cn/index/SolrFieldXPathDryad31Test.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java	src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathFgdcTest.java	src/test/java/org/dataone/cn/index/SolrFieldXPathFgdcTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrIndexDeleteTest.java	src/test/java/org/dataone/cn/index/SolrIndexDeleteTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrIndexFieldTest.java	src/test/java/org/dataone/cn/index/SolrIndexFieldTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrTokenenizerTest.java	src/test/java/org/dataone/cn/index/SolrTokenenizerTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/SolrIndexAnnotatorTest.java	src/test/java/org/dataone/cn/indexer/annotation/SolrIndexAnnotatorTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/parser	src/test/java/org/dataone/cn/indexer/parser
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrClientUpdateMechanismIT.java	src/test/java/org/dataone/cn/indexer/solrhttp/SolrClientUpdateMechanismIT.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrJClientIT.java	src/test/java/org/dataone/cn/indexer/solrhttp/SolrJClientIT.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrSchemaBeanConfigTest.java	src/test/java/org/dataone/cn/indexer/solrhttp/SolrSchemaBeanConfigTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrUpdatePerformanceIT.java	src/test/java/org/dataone/cn/indexer/solrhttp/SolrUpdatePerformanceIT.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/log4j.properties	src/test/resources/log4j.properties
	/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/solrconfig.xml	src/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/solrconfig.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/index/test-context.xml	src/test/resources/org/dataone/cn/index/test-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/indexer/solrhttp/it-test-context.xml	src/test/resources/org/dataone/cn/indexer/solrhttp/it-test-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/configuration/index-processor.properties	src/test/resources/org/dataone/configuration/index-processor.properties
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/test-index-parser-context.xml	src/test/resources/test-index-parser-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/test-index-processor-context.xml	src/test/resources/test-index-processor-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/test-indexer-solr-client-context.xml	src/test/resources/test-indexer-solr-client-context.xml
Revision 19906 by tao: Double the waiting time.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java	src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java
Revision 19905 by tao: Add a more thread sleeping time in order to let the index finish.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java	src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java
Revision 19901 by tao: Make the class public again.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.java	src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.java
Revision 19900 by tao: Merge the 2.3 branch back to trunk after releasing CCI 2.3.18.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_index_processor	.
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorDaemon.java	src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorDaemon.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java	src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/OntologyModelService.java	src/main/java/org/dataone/cn/indexer/annotation/OntologyModelService.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-annotator.xml	src/main/resources/application-context-annotator.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-eml-annotation.xml	src/main/resources/application-context-eml-annotation.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-eml-base.xml	src/main/resources/application-context-eml-base.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-eml220.xml	src/main/resources/application-context-eml220.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-ontology-model-service.xml	src/main/resources/application-context-ontology-model-service.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-context-file-includes.xml	src/main/resources/index-context-file-includes.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-parser-context.xml	src/main/resources/index-parser-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-solr-schema.xml	src/main/resources/index-solr-schema.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/ontologies	src/main/resources/ontologies
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java	src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessorTest.java	src/test/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessorTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessorTest.java	src/test/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessorTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/OntologyModelServiceTest.java	src/test/java/org/dataone/cn/indexer/annotation/OntologyModelServiceTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/SolrFieldEmlAnnotationTest.java	src/test/java/org/dataone/cn/indexer/annotation/SolrFieldEmlAnnotationTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.java	src/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.java
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/index/resources/d1_testdocs/eml220	src/test/resources/org/dataone/cn/index/resources/d1_testdocs/eml220
	/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/index/test-context.xml	src/test/resources/org/dataone/cn/index/test-context.xml
	/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xml	src/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xml