Repository: oodt Updated Branches: refs/heads/1.x-lucene [created] 419e94eff
fix merge Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/419e94ef Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/419e94ef Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/419e94ef Branch: refs/heads/1.x-lucene Commit: 419e94eff1368fbc32e1518fda873b2c11bd7612 Parents: d525231 75b009b Author: Tom Barber <[email protected]> Authored: Mon Jul 11 16:21:21 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Mon Jul 11 16:21:21 2016 +0100 ---------------------------------------------------------------------- .clover/coverage.dbf4gzwo_igdt060h | Bin 0 -> 56 bytes .clover/coverage.dbvv5975_igdt3tjt | Bin 0 -> 56 bytes .clover/coverage.dbvv5975_igdt4usa | Bin 0 -> 56 bytes 26.patch | 3506 ++++++++++++++++++ CHANGES.txt.orig | 1189 ++++++ app/fmbrowser/pom.xml | 1 + .../oodt/cas/filemgr/browser/model/CasDB.java | 7 +- .../cas/filemgr/browser/model/QueryBuilder.java | 30 +- catalog/pom.xml | 37 + catalog/src/main/avro/CommunicationChannel.avpr | 481 +++ .../AvrorpcCommunicationChannelClient.java | 485 +++ ...vrorpcCommunicationChannelClientFactory.java | 63 + .../AvrorpcCommunicationChannelServer.java | 432 +++ ...vrorpcCommunicationChannelServerFactory.java | 52 + .../TestAvrorpcCommunicationChannelServer.java | 145 + commons/pom.xml | 5 + .../apache/oodt/commons/util/DateConvert.java | 2 +- core/pom.xml | 76 +- crawler/pom.xml | 14 + .../crawl/action/FilemgrUniquenessChecker.java | 6 +- .../cas/crawl/action/SolrIndexingAction.java | 18 +- .../crawl/action/WorkflowMgrStatusUpdate.java | 6 +- .../FilemgrUniquenessCheckComparator.java | 1 + filemgr/pom.xml | 77 +- .../src/main/avro/types/AvroComplexQuery.avsc | 15 + filemgr/src/main/avro/types/AvroElement.avsc | 13 + .../src/main/avro/types/AvroExtractorSpec.avsc | 11 + .../main/avro/types/AvroFileTransferStatus.avsc | 12 + .../src/main/avro/types/AvroFilterAlgor.avsc | 11 + filemgr/src/main/avro/types/AvroMetadata.avsc | 8 + filemgr/src/main/avro/types/AvroMimeType.avsc | 8 + filemgr/src/main/avro/types/AvroProduct.avsc | 16 + .../src/main/avro/types/AvroProductPage.avsc | 14 + .../src/main/avro/types/AvroProductType.avsc | 17 + filemgr/src/main/avro/types/AvroQuery.avsc | 10 + .../src/main/avro/types/AvroQueryCriteria.avsc | 17 + .../src/main/avro/types/AvroQueryFilter.avsc | 13 + .../src/main/avro/types/AvroQueryResult.avsc | 12 + filemgr/src/main/avro/types/AvroReference.avsc | 13 + .../src/main/avro/types/AvroTypeHandler.avsc | 10 + filemgr/src/main/avro/types/protocol.avdl | 120 + filemgr/src/main/bin/filemgr | 4 +- filemgr/src/main/bin/filemgr-client | 2 +- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 430 ++- .../filemgr/catalog/LuceneCatalogFactory.java | 18 +- .../action/AbstractDeleteProductCliAction.java | 4 +- .../cli/action/DeleteProductByIdCliAction.java | 3 +- .../cli/action/FileManagerCliAction.java | 11 +- .../cli/action/GetFirstPageCliAction.java | 4 +- .../cli/action/GetLastPageCliAction.java | 4 +- .../cli/action/GetNextPageCliAction.java | 4 +- .../cli/action/GetNumProductsCliAction.java | 4 +- .../cli/action/GetPrevPageCliAction.java | 4 +- .../GetProductPercentTransferredCliAction.java | 4 +- .../cli/action/IngestProductCliAction.java | 3 +- .../cli/action/LuceneQueryCliAction.java | 33 +- .../cli/action/RetrieveFilesCliAction.java | 4 +- .../datatransfer/InPlaceDataTransferer.java | 7 +- .../datatransfer/LocalDataTransferer.java | 6 +- .../datatransfer/RemoteDataTransferer.java | 7 +- .../oodt/cas/filemgr/ingest/LocalCache.java | 9 +- .../oodt/cas/filemgr/ingest/StdIngester.java | 8 +- .../filemgr/system/AvroFileManagerClient.java | 746 ++++ .../filemgr/system/AvroFileManagerServer.java | 569 +++ .../oodt/cas/filemgr/system/FileManager.java | 1121 ++++++ .../cas/filemgr/system/FileManagerClient.java | 179 + .../filemgr/system/FileManagerClientMain.java | 35 + .../cas/filemgr/system/FileManagerServer.java | 66 + .../filemgr/system/FileManagerServerMain.java | 58 + .../filemgr/system/XmlRpcFileManagerClient.java | 2 +- .../filemgr/system/XmlRpcFileManagerServer.java | 458 +++ .../rpc/AvroFileManagerClientFactory.java | 61 + .../rpc/AvroFileManagerServerFactory.java | 46 + .../system/rpc/FileManagerClientFactory.java | 58 + .../system/rpc/FileManagerServerFactory.java | 44 + .../rpc/XmlRpcFileManagerClientFactory.java | 58 + .../rpc/XmlRpcFileManagerServerFactory.java | 44 + .../oodt/cas/filemgr/tools/CASAnalyzer.java | 37 +- .../oodt/cas/filemgr/tools/CatalogSearch.java | 33 +- .../oodt/cas/filemgr/tools/DeleteProduct.java | 6 +- .../oodt/cas/filemgr/tools/ExpImpCatalog.java | 10 +- .../tools/MetadataBasedProductMover.java | 6 +- .../oodt/cas/filemgr/tools/MetadataDumper.java | 7 +- .../filemgr/tools/OptimizeLuceneCatalog.java | 24 +- .../oodt/cas/filemgr/tools/ProductDumper.java | 7 +- .../oodt/cas/filemgr/tools/QueryTool.java | 29 +- .../cas/filemgr/tools/RangeQueryTester.java | 50 +- .../oodt/cas/filemgr/tools/SolrIndexer.java | 17 +- .../oodt/cas/filemgr/util/AvroTypeFactory.java | 528 +++ .../filemgr/util/RpcCommunicationFactory.java | 146 + filemgr/src/main/resources/filemgr.properties | 6 + .../cas/filemgr/catalog/TestLuceneCatalog.java | 27 +- .../cas/filemgr/cli/TestFileManagerCli.java | 6 +- .../cli/UseMockClientCmdLineActionStore.java | 8 +- .../cli/action/DummyFileManagerClient.java | 288 ++ .../cli/action/TestAddProductTypeCliAction.java | 8 +- .../action/TestDeleteProductByIdCliAction.java | 18 +- .../TestDeleteProductByNameCliAction.java | 18 +- .../cli/action/TestDumpMetadataCliAction.java | 6 +- .../action/TestGetCurrentTransferCliAction.java | 10 +- .../TestGetCurrentTransfersCliAction.java | 10 +- .../TestGetFilePercentTransferredCliAction.java | 6 +- .../cli/action/TestGetFirstPageCliAction.java | 14 +- .../cli/action/TestGetLastPageCliAction.java | 14 +- .../cli/action/TestGetNextPageCliAction.java | 12 +- .../cli/action/TestGetNumProductsCliAction.java | 10 +- .../cli/action/TestGetPrevPageCliAction.java | 12 +- .../cli/action/TestGetProductByIdCliAction.java | 10 +- .../action/TestGetProductByNameCliAction.java | 10 +- ...stGetProductPercentTransferredCliAction.java | 10 +- .../TestGetProductTypeByNameCliAction.java | 10 +- .../cli/action/TestHasProductCliAction.java | 6 +- .../cli/action/TestIngestProductCliAction.java | 10 +- .../cli/action/TestLuceneQueryCliAction.java | 6 +- .../cli/action/TestSqlQueryCliAction.java | 6 +- .../cas/filemgr/ingest/TestCachedIngester.java | 12 +- .../oodt/cas/filemgr/ingest/TestLocalCache.java | 19 +- .../oodt/cas/filemgr/ingest/TestRmiCache.java | 19 +- .../cas/filemgr/ingest/TestStdIngester.java | 13 +- .../examples/TestTikaAutoDetectExtractor.java | 5 - .../filemgr/structs/type/TestTypeHandler.java | 22 +- .../filemgr/system/MockFileManagerClient.java | 293 ++ .../cas/filemgr/system/TestRpcFileManager.java | 300 ++ .../system/TestRpcFileManagerClient.java | 353 ++ .../filemgr/system/TestXmlRpcFileManager.java | 10 +- .../system/rpc/TestServerClientFactories.java | 72 + .../cas/filemgr/tools/TestExpImpCatalog.java | 30 +- .../tools/TestMetadataBasedProductMover.java | 8 +- .../cas/filemgr/util/TestAvroTypesFactory.java | 199 + .../filemgr/util/TestXmlRpcStructFactory.java | 13 +- .../src/test/resources/createProduct/test.txt | 1 + filemgr/src/test/resources/filemgr.properties | 6 + grid/web-grid.iml.orig | 134 + grid/web-grid.iml.rej | 216 ++ .../filemgr/src/main/resources/bin/filemgr | 2 +- .../src/main/resources/bin/filemgr-client | 2 +- .../workflow/src/main/resources/bin/wmgr | 2 +- .../workflow/src/main/resources/bin/wmgr-client | 2 +- .../maven-cas-install-plugin.iml.orig | 48 + .../maven-cas-install-plugin.iml.rej | 70 + .../OpendapProfileElementExtractor.java | 1 + .../oodt/opendapps/util/ProfileUtils.java | 4 - .../org/apache/oodt/pcs/tools/PCSTrace.java | 2 +- .../apache/oodt/pcs/util/FileManagerUtils.java | 13 +- .../oodt/pcs/util/WorkflowManagerUtils.java | 12 +- .../apache/oodt/cas/pge/PGETaskInstance.java | 17 +- .../apache/oodt/cas/pge/staging/FileStager.java | 11 +- .../org/apache/oodt/cas/pge/util/XmlHelper.java | 1 + .../oodt/cas/pge/TestPGETaskInstance.java | 12 +- .../oodt/cas/pge/staging/TestFileStager.java | 10 +- pge/velocity.log.1 | 961 +++++ .../profile/handlers/cas/CASProfileHandler.java | 7 +- protocol/http/pom.xml | 2 +- .../cas/protocol/imaps/TestImapsProtocol.java | 18 +- .../webcomponents/filemgr/FileManagerConn.java | 9 +- .../webcomponents/workflow/WorkflowMgrConn.java | 9 +- .../oodt/cas/product/CASProductHandler.java | 7 +- .../cas/product/data/DataDeliveryServlet.java | 4 +- .../product/data/DatasetDeliveryServlet.java | 4 +- .../jaxrs/services/CasProductJaxrsService.java | 17 +- .../jaxrs/servlets/CasProductJaxrsServlet.java | 5 +- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 6 +- .../oodt/cas/product/rdf/RDFProductServlet.java | 6 +- .../oodt/cas/product/rss/RSSProductServlet.java | 3 +- .../product/rss/RSSProductTransferServlet.java | 6 +- workflow/pom.xml | 52 + workflow/src/main/avro/types/AvroWorkflow.avsc | 14 + .../main/avro/types/AvroWorkflowCondition.avsc | 15 + .../main/avro/types/AvroWorkflowInstance.avsc | 19 + .../avro/types/AvroWorkflowInstancePage.avsc | 13 + .../src/main/avro/types/AvroWorkflowTask.avsc | 20 + workflow/src/main/avro/types/protocol.avdl | 75 + workflow/src/main/bin/wmgr | 2 +- workflow/src/main/bin/wmgr-client | 2 +- .../cli/action/GetFirstPageCliAction.java | 3 +- .../cli/action/GetLastPageCliAction.java | 3 +- .../cli/action/GetNextPageCliAction.java | 3 +- .../cli/action/GetPrevPageCliAction.java | 3 +- .../cli/action/GetWorkflowInstCliAction.java | 4 +- .../cli/action/GetWorkflowInstsCliAction.java | 4 +- .../workflow/cli/action/WorkflowCliAction.java | 11 +- .../cas/workflow/examples/BranchRedirector.java | 8 +- .../examples/RandomStatusUpdateTask.java | 6 +- .../LuceneWorkflowInstanceRepository.java | 320 +- ...LuceneWorkflowInstanceRepositoryFactory.java | 25 +- .../oodt/cas/workflow/structs/TaskJob.java | 16 +- .../workflow/structs/WorkflowInstancePage.java | 2 +- .../workflow/system/AvroRpcWorkflowManager.java | 726 ++++ .../system/AvroRpcWorkflowManagerClient.java | 254 ++ .../cas/workflow/system/WorkflowManager.java | 31 + .../workflow/system/WorkflowManagerClient.java | 132 + .../system/WorkflowManagerClientStarter.java | 27 + .../workflow/system/WorkflowManagerStarter.java | 71 + .../workflow/system/XmlRpcWorkflowManager.java | 2 +- .../system/XmlRpcWorkflowManagerClient.java | 35 +- .../rpc/AvroRpcWorkflowManagerFactory.java | 50 + .../system/rpc/RpcCommunicationFactory.java | 93 + .../system/rpc/WorkflowManagerFactory.java | 60 + .../rpc/XmlRpcWorkflowManagerFactory.java | 48 + .../cas/workflow/tools/InstanceRepoCleaner.java | 7 +- .../oodt/cas/workflow/util/AvroTypeFactory.java | 323 ++ workflow/src/main/resources/workflow.properties | 6 + .../oodt/cas/workflow/cli/TestWorkflowCli.java | 6 +- .../cli/UseMockClientCmdLineActionStore.java | 10 +- .../system/MockWorkflowManagerClient.java | 327 ++ .../system/MockXmlRpcWorkflowManagerClient.java | 6 +- .../system/TestAvroRpcWorkflowManager.java | 158 + .../system/TestWorkflowManagerClient.java | 172 + .../workflow/tools/TestInstanceRepoCleaner.java | 2 +- workflow/src/test/resources/testinstrepo/_4.cfe | Bin 0 -> 289 bytes workflow/src/test/resources/testinstrepo/_4.cfs | Bin 0 -> 9749 bytes workflow/src/test/resources/testinstrepo/_4.si | Bin 0 -> 392 bytes .../src/test/resources/testinstrepo/_43.cfs | Bin 14148 -> 0 bytes workflow/src/test/resources/testinstrepo/_5.cfe | Bin 0 -> 289 bytes workflow/src/test/resources/testinstrepo/_5.cfs | Bin 0 -> 9749 bytes workflow/src/test/resources/testinstrepo/_5.si | Bin 0 -> 392 bytes .../src/test/resources/testinstrepo/deletable | Bin 4 -> 0 bytes .../resources/testinstrepo/pending_segments_b | Bin 0 -> 198 bytes .../src/test/resources/testinstrepo/segments | Bin 28 -> 0 bytes .../src/test/resources/testinstrepo/segments_a | Bin 0 -> 136 bytes .../src/test/resources/testinstrepo/write.lock | 0 workflow/src/test/resources/workflow.properties | 0 xmlquery/oodt-xmlquery.iml.orig | 41 + xmlquery/oodt-xmlquery.iml.rej | 66 + 224 files changed, 17937 insertions(+), 846 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/419e94ef/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/419e94ef/filemgr/pom.xml ---------------------------------------------------------------------- diff --cc filemgr/pom.xml index af9269a,dbac004..54b4e31 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@@ -212,8 -284,8 +284,9 @@@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <forkMode>never</forkMode> <!--forkMode>pertest</forkMode--> + <forkMode>pertest</forkMode> <!-- so we can DEBUG --> <argLine>-enableassertions</argLine> <useSystemClassLoader>false</useSystemClassLoader>
