This is an automated email from the ASF dual-hosted git repository. imesha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/oodt.git
commit f3dda2591bef8f16ce0a13dd4452538ca0f2f63d Merge: 07a7378 edc8e83 Author: Imesha Sudasingha <[email protected]> AuthorDate: Fri Jan 7 11:41:46 2022 +0530 Merge pull request #131 from apache/development Merge development into master .gitignore | 9 + CHANGES.txt | 9 + .../org/apache/oodt/commons/AvroExecServer.java | 11 +- .../java/org/apache/oodt/commons/ExecServer.java | 11 +- core/pom.xml | 58 + crawler/src/main/resources/logging.properties | 6 +- .../org/apache/oodt/security/sso/OpenSSOImpl.java | 2 +- deployment/assembly.xml | 58 + deployment/docker-compose.yml | 47 + deployment/docker/Dockerfile | 35 + deployment/docker/README.md | 36 + deployment/pom.xml | 125 + filemgr/Dockerfile | 8 + filemgr/pom.xml | 13 +- filemgr/src/main/bin/filemgr | 24 +- .../apache/oodt/cas/filemgr/catalog/Catalog.java | 2 - .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 63 +- .../filemgr/datatransfer/LocalDataTransferer.java | 4 + .../oodt/cas/filemgr/ingest/StdIngester.java | 14 +- .../oodt/cas/filemgr/structs/ExtractorSpec.java | 3 +- .../oodt/cas/filemgr/structs/ProductPage.java | 3 +- .../oodt/cas/filemgr/structs/ProductType.java | 3 +- .../apache/oodt/cas/filemgr/structs/Reference.java | 3 +- .../cas/filemgr/system/AvroFileManagerClient.java | 4 +- .../oodt/cas/filemgr/system/FileManagerClient.java | 3 +- .../filemgr/system/XmlRpcFileManagerClient.java | 2 +- .../cas/filemgr/util/RpcCommunicationFactory.java | 8 +- .../main/resources/examples/core/product-types.xml | 2 +- .../main/resources/examples/geo/product-types.xml | 2 +- .../resources/examples/trace/product-types.xml | 2 +- filemgr/src/main/resources/filemgr.properties | 12 +- filemgr/src/main/resources/logging.properties | 6 +- .../cas/filemgr/structs/type/TestTypeHandler.java | 6 +- filemgr/src/test/resources/test.logging.properties | 5 +- .../apache/oodt/cas/metadata/util/PathUtils.java | 8 + metadata/src/main/resources/logging.properties | 7 +- .../apache/oodt/cas/metadata/MetadataTestCase.java | 0 .../org/apache/oodt/cas/metadata/TestMetadata.java | 16 +- .../cas/metadata/TestSerializableMetadata.java | 18 +- .../extractors/TestAbstractSAXConfigReader.java | 0 .../extractors/TestCopyAndRewriteExtractor.java | 6 +- .../extractors/TestDataSourceMetExtractor.java | 0 .../extractors/TestExternMetExtractor.java | 4 +- .../TestExternMetExtractorConfigReader.java | 0 .../cas/metadata/extractors/TestMetReader.java | 6 +- .../TestProdTypePatternMetExtractor.java | 0 .../filenaming/TestPathUtilsNamingConvention.java | 0 .../preconditions/TestPreCondEvalUtils.java | 0 .../oodt/cas/metadata/util/TestMimeTypeUtils.java | 2 +- .../oodt/cas/metadata/util/TestPathUtils.java | 0 metadata/src/test/resources/tika-mimetypes.xml | 5928 ---- mvn/archetypes/radix/pom.xml | 4 +- .../META-INF/maven/archetype-metadata.xml | 18 +- .../main/resources/archetype-resources/.gitignore | 9 + .../main/resources/archetype-resources/README.txt | 2 +- .../archetype-resources/crawler/Dockerfile | 27 + .../resources/archetype-resources/crawler/pom.xml | 36 + .../src/main/resources/etc/logging.properties | 22 +- .../policy/extractor/mime-extractor-map.xml | 27 + .../main/resources/policy/extractor/mimetypes.xml | 4119 +++ .../src/main/resources/policy/extractor/tika.conf | 1 + .../archetype-resources/docker-compose.yml | 125 + .../archetype-resources/filemgr/Dockerfile | 25 + .../resources/archetype-resources/filemgr/pom.xml | 35 +- .../filemgr/src/main/resources/bin/filemgr | 6 + .../filemgr/src/main/resources/bin/filemgr-client | 6 + .../filemgr/src/main/resources/bin/query-tool | 6 + .../etc/filemgr.fm-solr-catalog.properties | 2 +- .../src/main/resources/etc/filemgr.properties | 8 +- .../src/main/resources/etc/logging.properties | 10 +- .../kubernetes/deployment-crawler.yaml | 60 + .../kubernetes/deployment-filemgr.yaml | 53 + .../kubernetes/deployment-opsui.yaml | 48 + .../kubernetes/deployment-resmgr.yaml | 50 + .../kubernetes/deployment-solr.yaml | 27 + .../kubernetes/deployment-workflow.yaml | 48 + .../kubernetes/service-filemgr.yaml | 19 + .../kubernetes/service-opsui.yaml | 19 + .../kubernetes/service-resmgr.yaml | 19 + .../kubernetes/service-solr.yaml | 19 + .../kubernetes/service-workflow.yaml | 19 + .../archetype-resources/kubernetes/vol-data.yaml | 14 + .../archetype-resources/kubernetes/vol-logs.yaml | 14 + .../kubernetes/vol-policy-crawler.yaml | 14 + .../kubernetes/vol-policy-filemgr.yaml | 14 + .../kubernetes/vol-policy-pcs.yaml | 14 + .../kubernetes/vol-policy-resmgr.yaml | 14 + .../kubernetes/vol-policy-workflow.yaml | 14 + .../archetype-resources/kubernetes/vol-temp.yaml | 14 + .../pcs/src/main/resources/etc/logging.properties | 7 +- .../src/main/resources/archetype-resources/pom.xml | 259 +- .../archetype-resources/resmgr/Dockerfile | 22 + .../resources/archetype-resources/resmgr/pom.xml | 36 + .../src/main/resources/etc/logging.properties | 10 +- .../src/main/resources/etc/resource.properties | 36 +- .../resources/archetype-resources/solr/Dockerfile | 9 + .../resources/archetype-resources/solr/pom.xml | 36 + .../archetype-resources/webapps/fmprod/Dockerfile | 15 + .../archetype-resources/webapps/fmprod/pom.xml | 36 + .../archetype-resources/webapps/opsui/Dockerfile | 21 + .../archetype-resources/webapps/opsui/pom.xml | 36 + .../webapps/pcs-services/Dockerfile | 18 + .../webapps/pcs-services/pom.xml | 36 + .../webapps/solr-webapp/Dockerfile | 14 + .../webapps/solr-webapp/pom.xml | 36 + .../archetype-resources/workflow/Dockerfile | 24 + .../resources/archetype-resources/workflow/pom.xml | 36 + .../workflow/src/main/resources/bin/wmgr | 6 + .../workflow/src/main/resources/bin/wmgr-client | 6 + .../src/main/resources/etc/logging.properties | 10 +- .../src/main/resources/etc/workflow.properties | 6 +- mvn/archetypes/radix/src/main/resources/bin/radix | 12 +- .../src/test/resources/projects/basic/goal.txt | 16 - .../archetype.properties | 8 +- .../projects/radix-archetype-test/goal.txt | 0 .../java/org/apache/oodt/pcs/health/CrawlInfo.java | 4 +- .../org/apache/oodt/pcs/health/CrawlerHealth.java | 4 +- .../oodt/pcs/health/CrawlerPropertiesMetKeys.java | 4 +- .../org/apache/oodt/pcs/health/CrawlerStatus.java | 4 +- .../apache/oodt/pcs/health/JobHealthStatus.java | 4 +- .../apache/oodt/pcs/health/PCSDaemonStatus.java | 4 +- .../oodt/pcs/health/PCSHealthMonitorMetKeys.java | 4 +- .../oodt/pcs/health/PCSHealthMonitorReport.java | 3 +- .../oodt/pcs/health/WorkflowStatesMetKeys.java | 4 +- .../apache/oodt/pcs/tools/PCSHealthMonitor.java | 2 +- .../org/apache/oodt/pcs/util/FileManagerUtils.java | 3 +- .../apache/oodt/pcs/util/ResourceManagerUtils.java | 22 +- .../apache/oodt/pcs/util/WorkflowManagerUtils.java | 3 +- pcs/core/src/main/resources/pcs.logging.properties | 3 +- pge/src/main/resources/logging.properties | 8 +- pom.xml | 3 + react-components/.gitignore | 5 + .../oodt_opsui_sample_app/.dockerignore | 2 + react-components/oodt_opsui_sample_app/.env | 2 + .../oodt_opsui_sample_app/.env.development | 2 + react-components/oodt_opsui_sample_app/Dockerfile | 11 + react-components/oodt_opsui_sample_app/README.md | 36 + .../oodt_opsui_sample_app/jsconfig.json | 8 + .../oodt_opsui_sample_app/package-lock.json | 31727 +++++++++++++++++++ .../oodt_opsui_sample_app/package.json | 42 + react-components/oodt_opsui_sample_app/pom.xml | 37 + .../oodt_opsui_sample_app/public/favicon.ico | Bin 0 -> 1595 bytes .../public/images/oodt_logo.png | Bin 0 -> 28444 bytes .../oodt_opsui_sample_app/public/index.html | 38 + .../oodt_opsui_sample_app/public/manifest.json | 15 + react-components/oodt_opsui_sample_app/src/App.js | 71 + .../oodt_opsui_sample_app/src/App.test.js | 9 + .../src/components/ComponentStatus.js | 135 + .../src/components/OPSUIHome.js | 215 + .../src/components/ProgressBar.js | 63 +- .../src/components/fileManager/Product/Product.js | 275 + .../src/components/fileManager/Product/index.js | 20 +- .../fileManager/ProductIngest/ProductIngest.js | 283 + .../components/fileManager/ProductIngest/index.js | 20 +- .../ProductIngestWithMetaFile.js | 212 + .../fileManager/ProductIngestWithMetaFile/index.js | 20 +- .../fileManager/ProductList/ProductList.js | 293 + .../fileManager/ProductList/SearchBar.js | 124 + .../components/fileManager/ProductList/index.js | 20 +- .../src/components/fileManager/index.js | 23 +- .../src/components/listItems.js | 60 + .../workflowManager/NewWorkflow/NewWorkflow.js | 125 + .../workflowManager/NewWorkflow/index.js | 20 +- .../workflowManager/WorkflowList/WorkflowList.js | 222 + .../workflowManager/WorkflowList/index.js | 20 +- .../src/components/workflowManager/index.js | 21 +- .../src/constants/connection.js | 24 +- .../oodt_opsui_sample_app/src/index.js | 11 + .../src/services/fmservice.js | 110 + .../src/services/wmservice.js | 66 + .../oodt_opsui_sample_app/src/utils/utils.js | 12 + .../swagger-implementations/file_manager.yaml | 206 + .../swagger-implementations/workflow_manager.yaml | 230 + .../resource/batchmgr/AvroRpcBatchMgrProxy.java | 10 +- .../cas/resource/cli/action/ResourceCliAction.java | 6 +- .../resource/system/AvroRpcResourceManager.java | 2 +- .../system/AvroRpcResourceManagerClient.java | 8 +- .../cas/resource/system/ResourceManagerClient.java | 3 +- .../system/rpc/ResourceManagerFactory.java | 12 +- resource/src/main/resources/logging.properties | 2 +- resource/src/main/resources/resource.properties | 10 +- .../src/test/resources/test.logging.properties | 3 +- webapp/components/pom.xml | 4 + webapp/fmbrowser/pom.xml | 2 + webapp/fmprod/README.md | 10 + webapp/fmprod/pom.xml | 19 +- .../oodt/cas/product/jaxrs/enums/ErrorType.java | 68 + .../cas/product/jaxrs/errors/ErrorMessage.java | 80 + .../BadRequestExceptionMapper.java | 53 + .../CasProductExceptionMapper.java | 50 + .../InternalServerErrorExceptionMapper.java | 51 + .../exceptionmappers/NotFoundExceptionMapper.java | 53 + .../jaxrs/exceptions/BadRequestException.java | 25 +- .../exceptions/InternalServerErrorException.java | 25 +- .../jaxrs/exceptions/NotFoundException.java | 25 +- .../cas/product/jaxrs/exceptions/package-info.java | 7 +- .../oodt/cas/product/jaxrs/filters/CORSFilter.java | 79 + .../product/jaxrs/resources/FMStatusResource.java | 57 + .../jaxrs/resources/ProductPageResource.java | 180 + .../jaxrs/resources/ProductTypeListResource.java | 54 + .../jaxrs/services/CasProductJaxrsService.java | 362 +- .../jaxrs/services/FileManagerJaxrsServiceV2.java | 530 + .../jaxrs/servlets/CasProductJaxrsServlet.java | 173 +- webapp/fmprod/src/main/webapp/WEB-INF/web.xml | 61 +- .../jaxrs/resources/DatasetResourceTest.java | 10 +- .../jaxrs/resources/MetadataResourceTest.java | 6 +- .../jaxrs/resources/ProductPageResourceTest.java | 159 + .../jaxrs/resources/ProductResourceTest.java | 6 +- .../jaxrs/resources/ReferenceResourceTest.java | 2 - .../jaxrs/resources/TransferResourceTest.java | 6 +- .../jaxrs/resources/TransfersResourceTest.java | 10 +- .../oodt/cas/product/jaxrs_rest/RestAPITest.java | 45 + .../product/handlers/ofsn/util/OFSNUtilsTest.java | 0 .../xmlquery/ChunkedProductInputStreamTest.java | 0 .../org/apache/oodt/xmlquery/LargeResultTest.java | 0 .../src/test/resources/test.logging.properties | 2 +- webapp/tomcat/Dockerfile | 6 + webapp/tomcat/pom.xml | 90 + webapp/wmonitor/pom.xml | 1 + webapp/wmservices/pom.xml | 171 +- .../cas/wmservices/client/WmServicesClient.java | 2 +- .../oodt/cas/wmservices/enums/ErrorType.java | 30 + .../oodt/cas/wmservices/errors/ErrorMessage.java | 81 + .../BadRequestExceptionMapper.java | 53 + .../CasWorkflowExceptionMapper.java | 50 + .../InternalServerErrorExceptionMapper.java | 51 + .../exceptionmappers/NotFoundExceptionMapper.java | 53 + .../exceptions/BadRequestException.java | 27 +- .../exceptions/InternalServerErrorException.java | 27 +- .../wmservices}/exceptions/NotFoundException.java | 27 +- .../oodt/cas/wmservices/filters/CORSFilter.java | 67 + .../cas/wmservices/resources/MetadataResource.java | 122 + .../resources/WMRequestStatusResource.java | 38 + .../resources/WorkflowEventListResource.java | 31 + .../resources/WorkflowInstancePageResource.java | 74 + .../resources/WorkflowInstanceResource.java | 101 + .../resources/WorkflowManagerStatus.java | 52 + .../resources/WorkflowStateResource.java | 74 + .../cas/wmservices/services/WMJaxrsServiceV2.java | 316 + .../cas/wmservices/servlets/WmServicesServlet.java | 123 +- .../src/main/webapp/META-INF/context.xml | 12 +- webapp/wmservices/src/main/webapp/WEB-INF/web.xml | 59 +- workflow/Dockerfile | 8 + workflow/pom.xml | 13 +- workflow/src/main/avro/types/protocol.avdl | 2 + workflow/src/main/bin/wmgr | 38 +- .../engine/ThreadPoolWorkflowEngineFactory.java | 5 +- .../engine/runner/ResourceRunnerFactory.java | 3 +- .../cas/workflow/structs/WorkflowInstancePage.java | 3 +- .../workflow/system/AvroRpcWorkflowManager.java | 6 +- .../system/AvroRpcWorkflowManagerClient.java | 17 +- .../cas/workflow/system/WorkflowManagerClient.java | 5 +- .../cas/workflow/system/XmlRpcWorkflowManager.java | 4 + .../system/XmlRpcWorkflowManagerClient.java | 11 + .../system/rpc/RpcCommunicationFactory.java | 4 +- workflow/src/main/resources/logging.properties | 8 +- workflow/src/main/resources/workflow.properties | 14 +- .../system/TestXmlRpcWorkflowManagerClient.java | 4 + .../src/test/resources/test.logging.properties | 3 +- 259 files changed, 44354 insertions(+), 7042 deletions(-)
