Merged branch master into avrorpc Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c51549d7 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c51549d7 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c51549d7
Branch: refs/heads/avrorpc Commit: c51549d7c078cc05812cd5ba61d43d421d0f8059 Parents: 6c58b74 f09e721 Author: Tom Barber <[email protected]> Authored: Fri Jul 1 00:09:49 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Jul 1 00:09:49 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 16 +- app/fmbrowser/pom.xml | 9 +- .../browser/controller/TableListener.java | 2 +- .../oodt/cas/filemgr/browser/model/CasDB.java | 3 +- .../cas/filemgr/browser/view/MainWindow.java | 1 - .../browser/view/menus/RightClickMenu.java | 8 - app/weditor/pom.xml | 2 +- .../perspective/view/impl/DefaultPropView.java | 15 +- .../perspective/view/impl/DefaultTreeView.java | 26 +- catalog/pom.xml | 9 +- .../catalog/mapping/DataSourceIngestMapper.java | 303 ++--- .../mapping/DataSourceIngestMapperFactory.java | 9 +- .../oodt/cas/catalog/mapping/IngestMapper.java | 38 +- .../cas/catalog/mapping/LuceneIngestMapper.java | 41 +- .../mapping/LuceneIngestMapperFactory.java | 1 + .../mapping/MemoryBasedIngestMapper.java | 27 +- .../mapping/MemoryBasedIngestMapperFactory.java | 1 + .../catalog/repository/CatalogRepository.java | 36 +- .../AbstractCommunicationChannelServer.java | 57 +- .../channel/CommunicationChannelClient.java | 31 +- .../XmlRpcCommunicationChannelClient.java | 67 +- .../XmlRpcCommunicationChannelServer.java | 63 +- .../struct/impl/index/DataSourceIndex.java | 29 - .../system/impl/CatalogServiceLocal.java | 6 +- .../oodt/cas/catalog/util/QueryUtils.java | 62 +- cli/README.txt | 1125 ------------------ cli/pom.xml | 2 +- commons/pom.xml | 7 +- .../org/apache/oodt/commons/util/JDBC_DB.java | 22 - core/pom.xml | 28 +- crawler/pom.xml | 7 +- curator/services/pom.xml | 2 +- .../cas/curation/service/MetadataResource.java | 4 - curator/webapp/pom.xml | 4 +- filemgr/pom.xml | 7 +- .../catalog/LenientDataSourceCatalog.java | 50 +- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 2 - .../cas/filemgr/catalog/ScienceDataCatalog.java | 9 - .../catalog/solr/DefaultProductSerializer.java | 6 +- .../cas/filemgr/catalog/solr/SolrCatalog.java | 2 +- .../datatransfer/LocalDataTransferer.java | 9 +- .../extractors/AbstractFilemgrMetExtractor.java | 5 - .../extractors/examples/MimeTypeExtractor.java | 2 - .../filemgr/structs/BooleanQueryCriteria.java | 19 +- .../filemgr/structs/FreeTextQueryCriteria.java | 8 +- .../oodt/cas/filemgr/structs/Product.java | 15 +- .../oodt/cas/filemgr/structs/ProductType.java | 1 + .../cas/filemgr/system/XmlRpcFileManager.java | 23 + .../oodt/cas/filemgr/tools/CatalogSearch.java | 9 +- .../apache/oodt/cas/filemgr/util/SqlParser.java | 34 +- .../cas/filemgr/util/XmlRpcStructFactory.java | 2 - filemgr/src/main/resources/schema.xml | 1025 ---------------- filemgr/src/main/resources/schema4.xml | 1003 ++++++++++++++++ filemgr/src/main/resources/schema5.xml | 611 ++++++++++ .../filemgr/system/TestXmlRpcFileManager.java | 4 - .../system/TestXmlRpcFileManagerClient.java | 26 + .../src/test/resources/ingest/test-delete.txt | 1 + .../test/resources/ingest/test-delete.txt.met | 10 + grid/pom.xml | 9 +- metadata/pom.xml | 7 +- .../preconditions/MimeTypeComparator.java | 2 +- mvn/archetypes/opsui/pom.xml | 2 +- mvn/archetypes/pom.xml | 2 +- mvn/archetypes/radix/pom.xml | 2 +- .../distribution/src/main/resources/bin/oodt | 4 +- .../radix/src/main/resources/bin/radix | 4 +- mvn/plugins/cas-install/pom.xml | 4 +- opendapps/pom.xml | 7 +- .../extractors/DasMetadataExtractor.java | 26 +- pcs/core/pom.xml | 2 +- .../org/apache/oodt/pcs/pedigree/Pedigree.java | 5 - .../apache/oodt/pcs/util/FileManagerUtils.java | 1 - pcs/input/pom.xml | 2 +- .../apache/oodt/pcs/input/PGEDataHandler.java | 11 +- pcs/opsui/pom.xml | 2 +- pcs/services/pom.xml | 2 +- pge/pom.xml | 2 +- pom.xml | 7 +- product/pom.xml | 7 +- profile/pom.xml | 7 +- .../apache/oodt/profile/gui/LeafListener.java | 22 +- .../gui/pstructs/ProfileAttributesPrinter.java | 26 +- .../gui/pstructs/ProfileElementPrinter.java | 21 +- .../profile/gui/pstructs/ProfilePrinter.java | 16 +- .../gui/pstructs/ResourceAttributesPrinter.java | 42 +- protocol/api/pom.xml | 2 +- protocol/ftp/pom.xml | 2 +- protocol/http/pom.xml | 2 +- .../oodt/cas/protocol/http/HttpProtocol.java | 113 +- protocol/imaps/pom.xml | 2 +- .../oodt/cas/protocol/imaps/ImapsProtocol.java | 20 - protocol/sftp/pom.xml | 2 +- pushpull/pom.xml | 7 +- .../oodt/cas/pushpull/expressions/Method.java | 17 +- .../pushpull/filerestrictions/VirtualFile.java | 2 - .../oodt/cas/pushpull/protocol/RemoteSite.java | 6 +- .../retrievalsystem/FileRetrievalSystem.java | 3 - resource/pom.xml | 7 +- .../oodt/cas/resource/examples/LongJob.java | 2 +- .../resource/system/XmlRpcResourceManager.java | 26 +- .../cas/resource/util/XmlStructFactory.java | 2 +- sso/pom.xml | 8 +- streaming/pom.xml | 4 +- webapp/components/pom.xml | 2 +- webapp/fmbrowser/pom.xml | 9 +- webapp/fmprod/pom.xml | 2 +- webapp/wmonitor/pom.xml | 9 +- workflow/pom.xml | 2 +- .../cli/action/GetTaskByIdCliAction.java | 8 +- .../cli/action/GetWorkflowByIdCliAction.java | 8 +- .../action/GetWorkflowsByEventCliAction.java | 8 +- .../engine/processor/WorkflowProcessor.java | 2 - .../processor/WorkflowProcessorHelper.java | 12 +- .../examples/PrerequisiteCondition.java | 97 ++ .../workflow/examples/ResmgrJobCondition.java | 100 ++ .../oodt/cas/workflow/util/DbStructFactory.java | 6 - .../oodt/cas/workflow/util/ScriptFile.java | 8 +- xmlps/pom.xml | 22 +- xmlquery/pom.xml | 7 +- .../org/apache/oodt/xmlquery/QueryHeader.java | 2 - .../java/org/apache/oodt/xmlquery/XMLQuery.java | 33 +- 121 files changed, 2443 insertions(+), 3311 deletions(-) ----------------------------------------------------------------------
