UnstableChanges

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 TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor.
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/READMEREADME
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/pom.xmlpom.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessor.javasrc/main/java/org/dataone/cn/index/processor/IndexTaskProcessor.java
The file was removed/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskProcessorRefactorReadinessPartial.javasrc/main/java/org/dataone/cn/index/processor/IndexTaskProcessorRefactorReadinessPartial.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexTaskUpdateProcessor.javasrc/main/java/org/dataone/cn/index/processor/IndexTaskUpdateProcessor.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/IndexVisibilityDelegateHazelcastImpl.javasrc/main/java/org/dataone/cn/index/processor/IndexVisibilityDelegateHazelcastImpl.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/index/processor/QueuePrioritizer.javasrc/main/java/org/dataone/cn/index/processor/QueuePrioritizer.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/AbstractStubMergingSubprocessor.javasrc/main/java/org/dataone/cn/indexer/AbstractStubMergingSubprocessor.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/D1IndexerSolrClient.javasrc/main/java/org/dataone/cn/indexer/D1IndexerSolrClient.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/SolrIndexService.javasrc/main/java/org/dataone/cn/indexer/SolrIndexService.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/SolrIndexServiceV2.javasrc/main/java/org/dataone/cn/indexer/SolrIndexServiceV2.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.javasrc/main/java/org/dataone/cn/indexer/annotation/AnnotatorSubprocessor.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.javasrc/main/java/org/dataone/cn/indexer/annotation/EmlAnnotationSubprocessor.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/annotation/RdfXmlSubprocessor.javasrc/main/java/org/dataone/cn/indexer/annotation/RdfXmlSubprocessor.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/BaseDocumentDeleteSubprocessor.javasrc/main/java/org/dataone/cn/indexer/parser/BaseDocumentDeleteSubprocessor.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/BaseXPathDocumentSubprocessor.javasrc/main/java/org/dataone/cn/indexer/parser/BaseXPathDocumentSubprocessor.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/IDocumentSubprocessorV2.javasrc/main/java/org/dataone/cn/indexer/parser/IDocumentSubprocessorV2.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessor.javasrc/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessor.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessorV2.javasrc/main/java/org/dataone/cn/indexer/parser/ResourceMapSubprocessorV2.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/ScienceMetadataDocumentSubprocessor.javasrc/main/java/org/dataone/cn/indexer/parser/ScienceMetadataDocumentSubprocessor.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/UpdateAssembler.javasrc/main/java/org/dataone/cn/indexer/parser/UpdateAssembler.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/utility/LeafElement.javasrc/main/java/org/dataone/cn/indexer/parser/utility/LeafElement.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/parser/utility/RootElement.javasrc/main/java/org/dataone/cn/indexer/parser/utility/RootElement.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/HTTPService.javasrc/main/java/org/dataone/cn/indexer/solrhttp/HTTPService.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrDoc.javasrc/main/java/org/dataone/cn/indexer/solrhttp/SolrDoc.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementField.javasrc/main/java/org/dataone/cn/indexer/solrhttp/SolrElementField.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrJClient.javasrc/main/java/org/dataone/cn/indexer/solrhttp/SolrJClient.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrSchema.javasrc/main/java/org/dataone/cn/indexer/solrhttp/SolrSchema.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-resourcemap.xmlsrc/main/resources/application-context-resourcemap.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-solr-schema.xmlsrc/main/resources/application-context-solr-schema.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-systemmeta200.xmlsrc/main/resources/application-context-systemmeta200.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-parser-context.xmlsrc/main/resources/index-parser-context.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-solr-schema.xmlsrc/main/resources/index-solr-schema.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index_processor.propertiessrc/main/resources/index_processor.properties
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/indexer-solr-client-context.xmlsrc/main/resources/indexer-solr-client-context.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/org/dataone/configuration/index-processor.propertiessrc/main/resources/org/dataone/configuration/index-processor.properties
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/BaseSolrFieldXPathTest.javasrc/test/java/org/dataone/cn/index/BaseSolrFieldXPathTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/DataONESolrJettyTestBase.javasrc/test/java/org/dataone/cn/index/DataONESolrJettyTestBase.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldDataCiteTest.javasrc/test/java/org/dataone/cn/index/SolrFieldDataCiteTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldDublinCoreOAITest.javasrc/test/java/org/dataone/cn/index/SolrFieldDublinCoreOAITest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldDublinCoreTest.javasrc/test/java/org/dataone/cn/index/SolrFieldDublinCoreTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldIsotc211Test.javasrc/test/java/org/dataone/cn/index/SolrFieldIsotc211Test.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathDryad31Test.javasrc/test/java/org/dataone/cn/index/SolrFieldXPathDryad31Test.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.javasrc/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathFgdcTest.javasrc/test/java/org/dataone/cn/index/SolrFieldXPathFgdcTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrIndexDeleteTest.javasrc/test/java/org/dataone/cn/index/SolrIndexDeleteTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrIndexFieldTest.javasrc/test/java/org/dataone/cn/index/SolrIndexFieldTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrTokenenizerTest.javasrc/test/java/org/dataone/cn/index/SolrTokenenizerTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/SolrIndexAnnotatorTest.javasrc/test/java/org/dataone/cn/indexer/annotation/SolrIndexAnnotatorTest.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/parsersrc/test/java/org/dataone/cn/indexer/parser
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrClientUpdateMechanismIT.javasrc/test/java/org/dataone/cn/indexer/solrhttp/SolrClientUpdateMechanismIT.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrJClientIT.javasrc/test/java/org/dataone/cn/indexer/solrhttp/SolrJClientIT.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrSchemaBeanConfigTest.javasrc/test/java/org/dataone/cn/indexer/solrhttp/SolrSchemaBeanConfigTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/solrhttp/SolrUpdatePerformanceIT.javasrc/test/java/org/dataone/cn/indexer/solrhttp/SolrUpdatePerformanceIT.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/log4j.propertiessrc/test/resources/log4j.properties
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/solrconfig.xmlsrc/test/resources/org/dataone/cn/index/resources/solr5home/collection1/conf/solrconfig.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/indexer/solrhttp/it-test-context.xmlsrc/test/resources/org/dataone/cn/indexer/solrhttp/it-test-context.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/configuration/index-processor.propertiessrc/test/resources/org/dataone/configuration/index-processor.properties
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/test-index-parser-context.xmlsrc/test/resources/test-index-parser-context.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/test-index-processor-context.xmlsrc/test/resources/test-index-processor-context.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/test/resources/test-indexer-solr-client-context.xmlsrc/test/resources/test-indexer-solr-client-context.xml
Revision 19906 by tao:
Double the waiting time.
Change TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.javasrc/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 TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.javasrc/test/java/org/dataone/cn/indexer/resourcemap/ProvRdfXmlProcessorTest.java
Revision 19901 by tao:
Make the class public again.
Change TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/java/org/dataone/cn/indexer/solrhttp/SolrElementAdd.javasrc/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 TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor.
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-annotator.xmlsrc/main/resources/application-context-annotator.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-eml-annotation.xmlsrc/main/resources/application-context-eml-annotation.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-eml-base.xmlsrc/main/resources/application-context-eml-base.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-eml220.xmlsrc/main/resources/application-context-eml220.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/application-context-ontology-model-service.xmlsrc/main/resources/application-context-ontology-model-service.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-context-file-includes.xmlsrc/main/resources/index-context-file-includes.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-parser-context.xmlsrc/main/resources/index-parser-context.xml
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/index-solr-schema.xmlsrc/main/resources/index-solr-schema.xml
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/src/main/resources/ontologiessrc/main/resources/ontologies
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.javasrc/test/java/org/dataone/cn/index/SolrFieldXPathEmlTest.java
The file was modified/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.javasrc/test/java/org/dataone/cn/indexer/annotation/SolrIndexEmlAnnotationTest.java
The file was added/software/cicore/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/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/trunk/cn/d1_cn_index_processor/src/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xmlsrc/test/resources/org/dataone/cn/indexer/annotation/test-context-annotator.xml