Merge branch 'master' into avro_rpc
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/fa572a2e Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/fa572a2e Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/fa572a2e Branch: refs/heads/development Commit: fa572a2e2ec8f2f2084324525b5c12f5fdbdacbe Parents: c9b8528 94a1c72 Author: Tom Barber <[email protected]> Authored: Fri Jul 1 20:44:32 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Jul 1 20:44:32 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 80 +- agility/setup.py | 2 +- app/fmbrowser/pom.xml | 57 +- .../browser/controller/TableListener.java | 36 +- .../oodt/cas/filemgr/browser/model/CasDB.java | 66 +- .../cas/filemgr/browser/model/QueryBuilder.java | 36 +- .../oodt/cas/filemgr/browser/model/Results.java | 2 +- .../cas/filemgr/browser/view/MainWindow.java | 24 +- .../cas/filemgr/browser/view/menus/MenuBar.java | 6 +- .../browser/view/menus/RightClickMenu.java | 8 - .../filemgr/browser/view/panels/BottomPane.java | 1 - .../filemgr/browser/view/panels/HeaderCell.java | 10 +- .../filemgr/browser/view/panels/QueryField.java | 18 +- .../filemgr/browser/view/panels/QueryPane.java | 11 +- .../filemgr/browser/view/panels/TablePane.java | 31 +- .../browser/view/prompts/ConnectPrompt.java | 16 +- .../view/prompts/QueryBuilderPrompt.java | 51 +- app/weditor/pom.xml | 170 +- .../oodt/cas/workflow/gui/WorkflowGUI.java | 83 +- .../oodt/cas/workflow/gui/model/ModelGraph.java | 90 +- .../oodt/cas/workflow/gui/model/ModelNode.java | 38 +- .../model/repo/XmlWorkflowModelRepository.java | 123 +- .../repo/XmlWorkflowModelRepositoryFactory.java | 6 +- .../gui/perspective/MultiStatePerspective.java | 7 +- .../workflow/gui/perspective/Perspective.java | 3 +- .../gui/perspective/build/BuildPerspective.java | 89 +- .../cas/workflow/gui/perspective/view/View.java | 8 +- .../gui/perspective/view/ViewListener.java | 2 +- .../gui/perspective/view/ViewState.java | 43 +- .../perspective/view/impl/DefaultPropView.java | 129 +- .../perspective/view/impl/DefaultTreeView.java | 119 +- .../perspective/view/impl/GlobalConfigView.java | 9 +- .../gui/perspective/view/impl/GraphView.java | 236 +- .../view/impl/JungJGraphModelAdapter.java | 8 +- .../perspective/view/impl/TreeProjectView.java | 18 +- .../oodt/cas/workflow/gui/toolbox/Tool.java | 5 +- .../oodt/cas/workflow/gui/toolbox/ToolBox.java | 6 +- .../oodt/cas/workflow/gui/util/GuiUtils.java | 112 +- .../apache/oodt/cas/workflow/gui/util/Line.java | 21 +- .../gui/util/exceptions/WorkflowException.java | 27 + balance/etc/skel/static/css/balance/balance.css | 6 +- .../cas-browser/static/css/cas-browser.css | 40 +- .../cas-browser/static/css/dataTables.css | 2 +- balance/modules/profile/static/css/profile.css | 2 +- balance/modules/puny/static/css/editor.css | 4 +- catalog/pom.xml | 294 ++- .../cli/action/CatalogServiceCliAction.java | 9 +- .../action/GetSupportedCatalogIdsCliAction.java | 5 +- .../catalog/cli/action/PagedQueryCliAction.java | 40 +- .../cas/catalog/cli/action/QueryCliAction.java | 28 +- .../cli/action/ReducedPagedQueryCliAction.java | 49 +- .../cli/action/ReducedQueryCliAction.java | 36 +- .../catalog/mapping/DataSourceIngestMapper.java | 329 +-- .../mapping/DataSourceIngestMapperFactory.java | 13 +- .../catalog/mapping/InMemoryIngestMapper.java | 5 +- .../oodt/cas/catalog/mapping/IngestMapper.java | 79 +- .../catalog/mapping/IngestMapperFactory.java | 2 +- .../cas/catalog/mapping/LuceneIngestMapper.java | 41 +- .../mapping/LuceneIngestMapperFactory.java | 1 + .../mapping/MemoryBasedIngestMapper.java | 140 +- .../mapping/MemoryBasedIngestMapperFactory.java | 1 + .../oodt/cas/catalog/page/CatalogReceipt.java | 22 +- .../oodt/cas/catalog/page/IndexPager.java | 5 +- .../apache/oodt/cas/catalog/page/PageInfo.java | 9 +- .../oodt/cas/catalog/page/QueryPager.java | 19 +- .../cas/catalog/page/TransactionReceipt.java | 9 +- .../query/ComparisonQueryExpression.java | 31 +- .../catalog/query/CustomQueryExpression.java | 9 +- .../catalog/query/FreeTextQueryExpression.java | 19 +- .../cas/catalog/query/QueryLogicalGroup.java | 17 +- .../time/MetadataTimeEventQueryFilter.java | 18 +- .../conv/AsciiSortableVersionConverter.java | 5 +- .../filter/time/conv/VersionConverter.java | 2 +- .../oodt/cas/catalog/query/parser/Node.java | 14 +- .../catalog/query/parser/ParseException.java | 49 +- .../cas/catalog/query/parser/QueryParser.java | 110 +- .../query/parser/QueryParserTokenManager.java | 261 +- .../query/parser/QueryParserTreeConstants.java | 20 +- .../catalog/query/parser/SimpleCharStream.java | 53 +- .../cas/catalog/query/parser/SimpleNode.java | 4 +- .../cas/catalog/query/parser/TokenMgrError.java | 7 +- .../catalog/repository/CatalogRepository.java | 50 +- .../repository/CatalogRepositoryFactory.java | 2 +- .../MemoryBasedCatalogRepository.java | 15 +- .../repository/SerializedCatalogRepository.java | 63 +- .../repository/SpringCatalogRepository.java | 2 +- .../server/CatalogServiceCommandLineClient.java | 4 +- .../server/CatalogServiceServerLauncher.java | 6 +- .../AbstractCommunicationChannelServer.java | 289 +-- .../channel/CommunicationChannelClient.java | 118 +- .../CommunicationChannelClientFactory.java | 6 +- .../channel/CommunicationChannelServer.java | 100 +- .../CommunicationChannelServerFactory.java | 8 +- .../rmi/RmiCommunicationChannelClient.java | 94 +- .../RmiCommunicationChannelClientInterface.java | 66 +- .../rmi/RmiCommunicationChannelServer.java | 8 +- .../XmlRpcCommunicationChannelClient.java | 483 ++-- .../XmlRpcCommunicationChannelServer.java | 175 +- .../oodt/cas/catalog/struct/Dictionary.java | 6 +- .../cas/catalog/struct/DictionaryFactory.java | 2 +- .../apache/oodt/cas/catalog/struct/Index.java | 11 +- .../oodt/cas/catalog/struct/IndexFactory.java | 2 +- .../oodt/cas/catalog/struct/IngestService.java | 8 +- .../oodt/cas/catalog/struct/QueryService.java | 12 +- .../oodt/cas/catalog/struct/TransactionId.java | 13 +- .../catalog/struct/TransactionIdFactory.java | 4 +- .../dictionary/WorkflowManagerDictionary.java | 45 +- .../struct/impl/index/DataSourceIndex.java | 293 +-- .../struct/impl/index/InMemoryIndex.java | 2 +- .../index/WorkflowManagerDataSourceIndex.java | 145 +- .../apache/oodt/cas/catalog/system/Catalog.java | 120 +- .../oodt/cas/catalog/system/CatalogFactory.java | 5 +- .../oodt/cas/catalog/system/CatalogService.java | 84 +- .../catalog/system/CatalogServiceFactory.java | 2 +- .../impl/CatalogServiceClientFactory.java | 12 +- .../system/impl/CatalogServiceLocal.java | 427 ++-- .../system/impl/CatalogServiceLocalFactory.java | 18 +- .../org/apache/oodt/cas/catalog/term/Term.java | 16 +- .../oodt/cas/catalog/term/TermBucket.java | 20 +- .../util/CasPropertyPlaceholderConfigurer.java | 19 +- .../cas/catalog/util/PluginClassLoader.java | 41 +- .../oodt/cas/catalog/util/QueryUtils.java | 62 +- .../oodt/cas/catalog/util/Serializer.java | 9 +- .../oodt/cas/catalog/util/SpringUtils.java | 22 +- .../system/impl/TestCatalogServiceLocal.java | 32 +- cli/README.txt | 1125 --------- cli/pom.xml | 202 +- .../org/apache/oodt/cas/cli/CmdLineArgs.java | 26 +- .../org/apache/oodt/cas/cli/CmdLineUtility.java | 8 +- .../cli/action/store/CmdLineActionStore.java | 10 +- .../action/store/CmdLineActionStoreFactory.java | 2 +- .../store/spring/SpringCmdLineActionStore.java | 18 +- .../spring/SpringSetContextInjectionType.java | 4 +- .../cas/cli/construct/CmdLineConstructor.java | 4 +- .../oodt/cas/cli/option/CmdLineOption.java | 50 +- .../cas/cli/option/CmdLineOptionInstance.java | 16 +- .../cas/cli/option/HandleableCmdLineOption.java | 6 +- .../cas/cli/option/SimpleCmdLineOption.java | 3 +- .../cli/option/ValidatableCmdLineOption.java | 4 +- .../option/handler/CmdLineOptionHandler.java | 12 +- .../cas/cli/option/require/RequirementRule.java | 4 +- .../cli/option/store/CmdLineOptionStore.java | 5 +- .../option/store/CmdLineOptionStoreFactory.java | 2 +- .../store/spring/SpringCmdLineOptionStore.java | 4 +- .../validator/CmdLineOptionValidator.java | 6 +- .../oodt/cas/cli/parser/CmdLineParser.java | 3 +- .../oodt/cas/cli/parser/StdCmdLineParser.java | 3 +- .../cas/cli/presenter/CmdLinePresenter.java | 10 +- .../oodt/cas/cli/printer/CmdLinePrinter.java | 16 +- .../oodt/cas/cli/printer/StdCmdLinePrinter.java | 100 +- .../apache/oodt/cas/cli/util/CmdLineUtils.java | 54 +- .../org/apache/oodt/cas/cli/util/ParsedArg.java | 2 +- .../handler/TestApplyToActionHandler.java | 3 +- .../oodt/cas/cli/util/TestCmdLineIterable.java | 2 +- .../oodt/cas/cli/util/TestCmdLineUtils.java | 2 - commons/pom.xml | 194 +- .../org/apache/oodt/commons/Configuration.java | 277 ++- .../commons/ConfigurationEntityResolver.java | 5 +- .../apache/oodt/commons/ConfiguredTestCase.java | 38 +- .../org/apache/oodt/commons/ExecServer.java | 113 +- .../apache/oodt/commons/ExecServerConfig.java | 29 +- .../org/apache/oodt/commons/Executable.java | 13 +- .../org/apache/oodt/commons/Initializer.java | 2 +- .../org/apache/oodt/commons/MultiServer.java | 148 +- .../apache/oodt/commons/activity/Activity.java | 32 +- .../oodt/commons/activity/ActivityTracker.java | 53 +- .../commons/activity/CompositeActivity.java | 51 +- .../oodt/commons/activity/DatagramLogger.java | 46 +- .../DatagramLoggingActivityFactory.java | 47 +- .../apache/oodt/commons/activity/History.java | 69 +- .../apache/oodt/commons/activity/Incident.java | 51 +- .../apache/oodt/commons/activity/Retrieval.java | 33 +- .../commons/activity/SQLDatabaseRetrieval.java | 23 +- .../commons/activity/SQLDatabaseStorage.java | 22 +- .../activity/XMLStandardOutputStorage.java | 35 +- .../oodt/commons/activity/XMLStorage.java | 59 +- .../database/DatabaseConnectionBuilder.java | 22 +- .../apache/oodt/commons/database/SqlScript.java | 45 +- .../org/apache/oodt/commons/date/DateUtils.java | 39 +- .../commons/exceptions/CommonsException.java | 11 + .../apache/oodt/commons/exec/EnvUtilities.java | 43 +- .../apache/oodt/commons/exec/ExecHelper.java | 24 +- .../org/apache/oodt/commons/exec/ExecUtils.java | 46 +- .../apache/oodt/commons/exec/StreamGobbler.java | 11 +- .../oodt/commons/filter/ObjectTimeEvent.java | 7 +- .../apache/oodt/commons/filter/TimeEvent.java | 18 +- .../commons/filter/TimeEventWeightedHash.java | 94 +- .../commons/io/Base64DecodingInputStream.java | 64 +- .../commons/io/Base64EncodingOutputStream.java | 48 +- .../oodt/commons/io/DirectorySelector.java | 9 +- .../commons/io/FixedBufferOutputStream.java | 28 +- .../java/org/apache/oodt/commons/io/Log.java | 44 +- .../org/apache/oodt/commons/io/LogFilter.java | 24 +- .../org/apache/oodt/commons/io/LogListener.java | 8 +- .../org/apache/oodt/commons/io/LogWriter.java | 50 +- .../oodt/commons/io/LoggerOutputStream.java | 11 +- .../apache/oodt/commons/io/NullInputStream.java | 4 +- .../oodt/commons/io/NullOutputStream.java | 18 +- .../apache/oodt/commons/io/WriterLogger.java | 19 +- .../oodt/commons/object/jndi/HTTPContext.java | 42 +- .../oodt/commons/object/jndi/ObjectContext.java | 236 +- .../commons/object/jndi/ObjectNameParser.java | 2 +- .../oodt/commons/object/jndi/RMIContext.java | 70 +- .../commons/pagination/PaginationUtils.java | 12 +- .../spring/SpringSetIdInjectionType.java | 4 +- .../postprocessor/SetIdBeanPostProcessor.java | 5 +- .../org/apache/oodt/commons/util/Base64.java | 131 +- .../org/apache/oodt/commons/util/CacheMap.java | 43 +- .../org/apache/oodt/commons/util/DOMParser.java | 33 +- .../apache/oodt/commons/util/DateConvert.java | 48 +- .../apache/oodt/commons/util/Documentable.java | 2 - .../commons/util/EnterpriseEntityResolver.java | 61 +- .../org/apache/oodt/commons/util/JDBC_DB.java | 170 +- .../java/org/apache/oodt/commons/util/LDAP.java | 5 +- .../oodt/commons/util/LogEventMultiplexer.java | 33 +- .../org/apache/oodt/commons/util/LogInit.java | 21 +- .../apache/oodt/commons/util/MemoryLogger.java | 30 +- .../apache/oodt/commons/util/PropertyMgr.java | 8 +- .../org/apache/oodt/commons/util/SAXParser.java | 10 +- .../org/apache/oodt/commons/util/Utility.java | 36 +- .../java/org/apache/oodt/commons/util/XML.java | 133 +- .../org/apache/oodt/commons/util/XMLRPC.java | 116 +- .../apache/oodt/commons/util/XMLRPCFault.java | 6 - .../org/apache/oodt/commons/xml/DOMUtil.java | 9 +- .../org/apache/oodt/commons/xml/XMLUtils.java | 51 +- .../apache/oodt/commons/AbstractTestCase.java | 1 - .../java/org/apache/oodt/commons/AppTest.java | 1 - .../apache/oodt/commons/ConfigurationTest.java | 47 +- .../oodt/commons/ConfiguredTestCaseTest.java | 1 - .../org/apache/oodt/commons/NaughtyTest.java | 1 - .../commons/activity/CompositeActivityTest.java | 36 +- .../DatagramLoggingActivityFactoryTest.java | 4 +- .../oodt/commons/activity/HistoryTest.java | 6 +- .../oodt/commons/io/DirectorySelectorTest.java | 17 + .../commons/io/FixedBufferOutputStreamTest.java | 17 +- .../oodt/commons/io/NullInputStreamTest.java | 2 +- .../oodt/commons/io/NullOutputStreamTest.java | 2 +- .../commons/object/jndi/ObjectContextTest.java | 24 +- .../oodt/commons/object/jndi/TContext.java | 204 ++ .../oodt/commons/object/jndi/TestContext.java | 203 -- .../commons/object/jndi/TestContextTest.java | 8 +- .../apache/oodt/commons/util/Base64Test.java | 1 - .../apache/oodt/commons/util/CacheMapTest.java | 2 - .../org/apache/oodt/commons/util/LDAPTest.java | 2 - .../org/apache/oodt/commons/util/XMLTest.java | 8 +- commons/src/test/resources/test.xml | 16 + core/pom.xml | 1399 +++++++---- crawler/pom.xml | 334 +-- .../cas/crawl/AutoDetectProductCrawler.java | 47 +- .../cas/crawl/MetExtractorProductCrawler.java | 28 +- .../apache/oodt/cas/crawl/ProductCrawler.java | 30 +- .../oodt/cas/crawl/StdProductCrawler.java | 4 +- .../cas/crawl/action/CrawlerActionPhases.java | 2 +- .../cas/crawl/action/EmailNotification.java | 21 +- .../oodt/cas/crawl/action/ExternAction.java | 2 +- .../oodt/cas/crawl/action/FileBasedAction.java | 4 +- .../oodt/cas/crawl/action/FileSettings.java | 2 +- .../crawl/action/FilemgrUniquenessChecker.java | 2 +- .../oodt/cas/crawl/action/GroupAction.java | 7 +- .../oodt/cas/crawl/action/IngestAncillary.java | 11 +- .../cas/crawl/action/MimeTypeCrawlerAction.java | 23 +- .../apache/oodt/cas/crawl/action/MoveFile.java | 13 +- .../cas/crawl/action/SolrIndexingAction.java | 9 +- .../oodt/cas/crawl/action/TernaryAction.java | 8 +- .../oodt/cas/crawl/action/ToggleAction.java | 3 +- .../crawl/action/WorkflowMgrStatusUpdate.java | 2 +- .../handler/CrawlerActionInfoHandler.java | 7 +- .../FilemgrUniquenessCheckComparator.java | 5 +- .../cas/crawl/config/ProductCrawlerBean.java | 2 +- .../oodt/cas/crawl/daemon/CrawlDaemon.java | 13 +- .../cas/crawl/daemon/CrawlDaemonController.java | 70 +- .../oodt/cas/crawl/status/IngestStatus.java | 10 +- .../crawl/typedetection/MetExtractorSpec.java | 19 +- .../MimeExtractorConfigMetKeys.java | 32 +- .../MimeExtractorConfigReader.java | 75 +- .../crawl/typedetection/MimeExtractorRepo.java | 50 +- .../util/CasPropertyPlaceholderConfigurer.java | 11 +- .../cas/crawl/option/TestBooleanOptions.java | 4 +- .../TestMimeExtractorConfigReader.java | 1 - curator/services/pom.xml | 209 +- .../curation/metadata/CuratorConfMetKeys.java | 22 +- .../cas/curation/service/CurationService.java | 31 +- .../curation/service/CurationServiceConfig.java | 15 +- .../cas/curation/service/DirectoryResource.java | 24 +- .../cas/curation/service/IngestionResource.java | 39 +- .../cas/curation/service/MetadataResource.java | 185 +- .../cas/curation/service/PolicyResource.java | 39 +- .../cas/curation/structs/IngestionTask.java | 5 +- .../curation/structs/IngestionTaskStatus.java | 6 +- .../curation/util/CurationXmlStructFactory.java | 26 +- .../oodt/cas/curation/util/DateUtils.java | 10 +- .../curation/util/ExtractorConfigReader.java | 22 +- .../curation/util/ExtractorConfigWriter.java | 20 +- .../util/exceptions/CurationException.java | 11 + curator/webapp/pom.xml | 227 +- .../apache/oodt/cas/curation/CurationApp.java | 28 +- .../org/apache/oodt/cas/curation/HomePage.css | 32 +- .../org/apache/oodt/cas/curation/HomePage.html | 2 +- .../org/apache/oodt/cas/curation/HomePage.java | 2 +- .../apache/oodt/cas/curation/HomePage_edrn.html | 2 +- .../oodt/cas/curation/HomePage_wicket.css | 32 +- .../oodt/cas/curation/edrn-informatics.css | 61 +- .../cas/curation/edrn-informatics_wicket.css | 61 +- .../oodt/cas/curation/login/LoginPage.css | 22 +- filemgr/pom.xml | 472 ++-- .../oodt/cas/filemgr/catalog/Catalog.java | 42 +- .../cas/filemgr/catalog/CatalogFactory.java | 2 +- .../cas/filemgr/catalog/DataSourceCatalog.java | 936 ++++--- .../catalog/DataSourceCatalogFactory.java | 20 +- .../catalog/LenientDataSourceCatalog.java | 492 ++-- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 310 ++- .../filemgr/catalog/LuceneCatalogFactory.java | 25 +- .../catalog/MappedDataSourceCatalog.java | 3 +- .../catalog/MappedDataSourceCatalogFactory.java | 26 +- .../cas/filemgr/catalog/ScienceDataCatalog.java | 136 +- .../catalog/ScienceDataCatalogFactory.java | 2 +- .../catalog/solr/DefaultProductSerializer.java | 103 +- .../catalog/solr/ProductIdGenerator.java | 2 +- .../cas/filemgr/catalog/solr/SolrCatalog.java | 41 +- .../cas/filemgr/catalog/solr/SolrClient.java | 84 +- .../cli/action/AbstractQueryCliAction.java | 4 +- .../cli/action/DeleteProductByIdCliAction.java | 14 +- .../action/DeleteProductByNameCliAction.java | 7 +- .../cli/action/GetProductByIdCliAction.java | 8 +- .../cli/action/GetProductByNameCliAction.java | 8 +- .../action/GetProductTypeByNameCliAction.java | 3 +- .../filemgr/cli/action/HasProductCliAction.java | 3 +- .../cli/action/IngestProductCliAction.java | 38 +- .../cli/action/LuceneQueryCliAction.java | 35 +- .../cli/action/RetrieveFilesCliAction.java | 2 +- .../filemgr/cli/action/SqlQueryCliAction.java | 4 +- .../cas/filemgr/datatransfer/DataTransfer.java | 10 +- .../datatransfer/DataTransferFactory.java | 2 +- .../datatransfer/LocalDataTransferer.java | 180 +- .../datatransfer/RemoteDataTransferFactory.java | 6 +- .../datatransfer/RemoteDataTransferer.java | 97 +- .../filemgr/datatransfer/S3DataTransferer.java | 6 +- .../datatransfer/TransferStatusTracker.java | 40 +- .../exceptions/FileManagerException.java | 11 + .../apache/oodt/cas/filemgr/ingest/Cache.java | 28 +- .../oodt/cas/filemgr/ingest/CacheFactory.java | 2 +- .../oodt/cas/filemgr/ingest/CachedIngester.java | 29 +- .../cas/filemgr/ingest/CmdLineIngester.java | 13 +- .../oodt/cas/filemgr/ingest/Ingester.java | 14 +- .../oodt/cas/filemgr/ingest/LocalCache.java | 28 +- .../cas/filemgr/ingest/RemoteableCache.java | 28 +- .../oodt/cas/filemgr/ingest/RmiCache.java | 24 +- .../oodt/cas/filemgr/ingest/RmiCacheServer.java | 15 +- .../oodt/cas/filemgr/ingest/StdIngester.java | 67 +- .../oodt/cas/filemgr/metadata/CoreMetKeys.java | 18 +- .../cas/filemgr/metadata/ProductMetKeys.java | 24 +- .../extractors/AbstractFilemgrMetExtractor.java | 40 +- .../metadata/extractors/CoreMetExtractor.java | 10 +- .../extractors/FilemgrMetExtractor.java | 4 +- .../examples/FinalFileLocationExtractor.java | 3 +- .../extractors/examples/MimeTypeExtractor.java | 2 - .../repository/DataSourceRepositoryManager.java | 54 +- .../DataSourceRepositoryManagerFactory.java | 4 +- .../filemgr/repository/RepositoryManager.java | 17 +- .../repository/RepositoryManagerFactory.java | 2 +- .../ScienceDataRepositoryManager.java | 27 +- .../ScienceDataRepositoryManagerFactory.java | 2 +- .../repository/XMLRepositoryManager.java | 206 +- .../filemgr/structs/BooleanQueryCriteria.java | 29 +- .../oodt/cas/filemgr/structs/Element.java | 2 - .../filemgr/structs/FreeTextQueryCriteria.java | 35 +- .../oodt/cas/filemgr/structs/Product.java | 59 +- .../oodt/cas/filemgr/structs/ProductType.java | 1 + .../apache/oodt/cas/filemgr/structs/Query.java | 13 +- .../oodt/cas/filemgr/structs/QueryCriteria.java | 3 +- .../cas/filemgr/structs/RangeQueryCriteria.java | 7 +- .../oodt/cas/filemgr/structs/Reference.java | 39 +- .../cas/filemgr/structs/TermQueryCriteria.java | 3 +- .../structs/exceptions/CacheException.java | 5 + .../structs/exceptions/CatalogException.java | 5 + .../exceptions/RepositoryManagerException.java | 6 + .../cas/filemgr/structs/query/ComplexQuery.java | 6 +- .../cas/filemgr/structs/query/QueryFilter.java | 6 +- .../cas/filemgr/structs/query/QueryResult.java | 60 +- .../structs/query/QueryResultComparator.java | 9 +- .../conv/AsciiSortableVersionConverter.java | 5 +- .../structs/query/conv/VersionConverter.java | 2 +- .../structs/query/filter/ObjectTimeEvent.java | 7 +- .../filemgr/structs/query/filter/TimeEvent.java | 16 +- .../cas/filemgr/structs/type/TypeHandler.java | 9 +- .../structs/type/ValueReplaceTypeHandler.java | 11 +- .../cas/filemgr/system/XmlRpcFileManager.java | 2278 ++++++++++-------- .../filemgr/system/XmlRpcFileManagerClient.java | 2174 +++++++++-------- .../cas/filemgr/system/auth/Dispatcher.java | 4 +- .../oodt/cas/filemgr/system/auth/Result.java | 3 +- .../filemgr/system/auth/SecureWebServer.java | 26 +- .../oodt/cas/filemgr/tools/CASAnalyzer.java | 15 +- .../oodt/cas/filemgr/tools/CatalogSearch.java | 112 +- .../oodt/cas/filemgr/tools/DeleteProduct.java | 45 +- .../cas/filemgr/tools/DumpDbElementsToXml.java | 11 +- .../oodt/cas/filemgr/tools/ExpImpCatalog.java | 335 +-- .../tools/MetadataBasedProductMover.java | 75 +- .../oodt/cas/filemgr/tools/MetadataDumper.java | 9 +- .../filemgr/tools/OptimizeLuceneCatalog.java | 13 +- .../oodt/cas/filemgr/tools/ProductDumper.java | 9 +- .../cas/filemgr/tools/ProductTypeDocTool.java | 8 +- .../oodt/cas/filemgr/tools/QueryTool.java | 113 +- .../cas/filemgr/tools/RangeQueryTester.java | 9 +- .../oodt/cas/filemgr/tools/SolrIndexer.java | 73 +- .../oodt/cas/filemgr/util/DbStructFactory.java | 3 +- .../util/GenericFileManagerObjectFactory.java | 88 +- .../oodt/cas/filemgr/util/Pagination.java | 13 +- .../oodt/cas/filemgr/util/QueryUtils.java | 7 +- .../apache/oodt/cas/filemgr/util/SqlParser.java | 125 +- .../cas/filemgr/util/XmlRpcStructFactory.java | 1254 +++++----- .../oodt/cas/filemgr/util/XmlStructFactory.java | 135 +- .../validation/DataSourceValidationLayer.java | 110 +- .../DataSourceValidationLayerFactory.java | 4 +- .../validation/ScienceDataValidationLayer.java | 64 +- .../ScienceDataValidationLayerFactory.java | 2 +- .../cas/filemgr/validation/ValidationLayer.java | 18 +- .../validation/ValidationLayerFactory.java | 2 +- .../filemgr/validation/XMLValidationLayer.java | 404 ++-- .../cas/filemgr/versioning/BasicVersioner.java | 19 +- .../filemgr/versioning/DateTimeVersioner.java | 84 +- .../versioning/MetadataBasedFileVersioner.java | 2 +- .../versioning/SingleFileBasicVersioner.java | 13 +- .../oodt/cas/filemgr/versioning/Versioner.java | 4 +- .../cas/filemgr/versioning/VersioningUtils.java | 122 +- filemgr/src/main/resources/schema.xml | 1025 -------- filemgr/src/main/resources/schema4.xml | 1003 ++++++++ filemgr/src/main/resources/schema5.xml | 611 +++++ filemgr/src/site/resources/css/guides.css | 2 +- .../oodt/cas/filemgr/catalog/MockCatalog.java | 2 +- .../oodt/cas/filemgr/catalog/TestAppender.java | 29 + .../filemgr/catalog/TestDataSourceCatalog.java | 177 +- .../cas/filemgr/catalog/TestLuceneCatalog.java | 543 ++++- .../catalog/TestMappedDataSourceCatalog.java | 6 +- .../catalog/TestOrderedDataSourceCatalog.java | 15 +- .../cli/UseMockClientCmdLineActionStore.java | 2 +- .../cli/action/TestGetPrevPageCliAction.java | 2 +- .../cli/action/TestIngestProductCliAction.java | 6 - .../cas/filemgr/ingest/TestCachedIngester.java | 39 +- .../oodt/cas/filemgr/ingest/TestLocalCache.java | 32 +- .../oodt/cas/filemgr/ingest/TestRmiCache.java | 20 +- .../cas/filemgr/ingest/TestStdIngester.java | 7 +- .../examples/TestTikaAutoDetectExtractor.java | 19 +- .../repository/TestXMLRepositoryManager.java | 7 +- .../oodt/cas/filemgr/structs/TestProduct.java | 12 +- .../filemgr/structs/type/TestTypeHandler.java | 229 +- .../system/MockXmlRpcFileManagerClient.java | 1 - .../filemgr/system/TestXmlRpcFileManager.java | 31 +- .../system/TestXmlRpcFileManagerClient.java | 42 +- .../cas/filemgr/tools/TestExpImpCatalog.java | 43 +- .../tools/TestMetadataBasedProductMover.java | 16 +- .../filemgr/util/TestXmlRpcStructFactory.java | 12 +- .../cas/filemgr/util/TestXmlStructFactory.java | 19 +- .../validation/TestXMLValidationLayer.java | 15 +- .../TestAcquisitionDateVersioner.java | 23 +- .../filemgr/versioning/TestBasicVersioner.java | 2 +- .../versioning/TestDateTimeVersioner.java | 2 +- .../TestDirectoryBasedProductVersioner.java | 17 +- .../src/test/resources/ingest/test-delete.txt | 1 + .../test/resources/ingest/test-delete.txt.met | 10 + grid/pom.xml | 105 +- .../java/org/apache/oodt/grid/ConfigBean.java | 6 +- .../org/apache/oodt/grid/ConfigServlet.java | 60 +- .../org/apache/oodt/grid/Configuration.java | 64 +- .../java/org/apache/oodt/grid/GridServlet.java | 20 +- .../java/org/apache/oodt/grid/LoginServlet.java | 8 +- .../apache/oodt/grid/ProductQueryServlet.java | 75 +- .../apache/oodt/grid/ProfileQueryServlet.java | 79 +- .../java/org/apache/oodt/grid/QueryServlet.java | 81 +- .../oodt/grid/RestfulProductQueryServlet.java | 13 +- .../main/java/org/apache/oodt/grid/Server.java | 32 +- .../main/java/org/apache/oodt/grid/Utility.java | 2 +- grid/src/main/webapp/style.css | 4 +- metadata/pom.xml | 187 +- .../oodt/cas/metadata/AbstractMetExtractor.java | 3 +- .../apache/oodt/cas/metadata/MetExtractor.java | 20 +- .../cas/metadata/MetExtractorConfigReader.java | 2 +- .../org/apache/oodt/cas/metadata/Metadata.java | 170 +- .../oodt/cas/metadata/SerializableMetadata.java | 40 +- .../exceptions/CasMetadataException.java | 27 + .../PreconditionComparatorException.java | 4 +- .../extractors/CmdLineMetExtractor.java | 4 +- .../extractors/CopyAndRewriteExtractor.java | 7 +- .../extractors/DataSourceMetExtractor.java | 38 +- .../metadata/extractors/ExternConfigReader.java | 55 +- .../extractors/ExternConfigReaderMetKeys.java | 22 +- .../metadata/extractors/ExternMetExtractor.java | 31 +- .../extractors/ExternMetExtractorMetKeys.java | 6 +- .../extractors/FilenameTokenConfig.java | 3 +- .../FilenameTokenExtractorMetKeys.java | 16 +- .../extractors/FilenameTokenMetExtractor.java | 10 +- .../metadata/extractors/MetReaderExtractor.java | 21 +- .../extractors/ProdTypePatternMetExtractor.java | 8 +- .../extractors/TikaCmdLineMetExtractor.java | 14 +- .../metadata/filenaming/NamingConvention.java | 2 +- .../preconditions/ExistanceCheckComparator.java | 2 +- .../ExternPreconditionComparator.java | 15 +- .../preconditions/FileSizeComparator.java | 2 +- .../LastModifiedCheckComparator.java | 11 +- .../preconditions/MimeTypeComparator.java | 23 +- .../preconditions/PreCondEvalUtils.java | 13 +- .../preconditions/PreConditionComparator.java | 17 +- .../PreConditionOperatorMetKeys.java | 8 +- .../ProductNameCheckComparator.java | 12 +- .../preconditions/RegExExcludeComparator.java | 50 + .../SubProductExistenceCheckComparator.java | 8 +- .../util/GenericMetadataObjectFactory.java | 10 +- .../oodt/cas/metadata/util/MimeTypeUtils.java | 23 +- .../oodt/cas/metadata/util/PathUtils.java | 90 +- .../oodt/cas/metadata/util/PropertiesUtils.java | 2 - .../cas/metadata/TestSerializableMetadata.java | 4 +- mvn/archetypes/opsui/pom.xml | 16 +- mvn/archetypes/pom.xml | 4 +- mvn/archetypes/radix/pom.xml | 18 +- .../distribution/src/main/resources/bin/oodt | 4 +- .../solr/src/main/assembly/assembly.xml | 16 + .../main/resources/oodt-fm/conf/solrconfig.xml | 6 +- .../radix/src/main/resources/bin/radix | 4 +- mvn/plugins/cas-install/pom.xml | 92 +- .../oodt/cas/install/CASInstallDirMetKeys.java | 10 +- .../oodt/cas/install/CASInstallDistMojo.java | 131 +- opendapps/pom.xml | 82 +- .../org/apache/oodt/opendapps/DapNames.java | 12 +- .../apache/oodt/opendapps/DatasetCrawler.java | 31 +- .../apache/oodt/opendapps/DatasetExtractor.java | 33 +- .../OpendapProfileElementExtractor.java | 40 +- .../oodt/opendapps/OpendapProfileHandler.java | 2 +- .../org/apache/oodt/opendapps/Profiler.java | 5 +- .../oodt/opendapps/config/ConstantSpec.java | 9 +- .../oodt/opendapps/config/DatasetMetElem.java | 4 +- .../opendapps/config/OpendapConfigMetKeys.java | 60 +- .../opendapps/config/OpendapProfileMetKeys.java | 8 +- .../config/ProcessingInstructions.java | 4 +- .../extractors/DasMetadataExtractor.java | 26 +- .../extractors/ThreddsMetadataExtractor.java | 18 +- .../oodt/opendapps/util/ProfileChecker.java | 32 +- .../oodt/opendapps/util/ProfileSerializer.java | 4 +- .../oodt/opendapps/util/ProfileUtils.java | 60 +- pcs/core/pom.xml | 116 +- .../oodt/pcs/health/CrawlPropertiesFile.java | 5 +- .../apache/oodt/pcs/health/CrawlerHealth.java | 4 +- .../pcs/health/CrawlerPropertiesMetKeys.java | 6 +- .../apache/oodt/pcs/health/JobHealthStatus.java | 9 +- .../pcs/health/PCSHealthMonitorMetKeys.java | 24 +- .../oodt/pcs/health/PCSHealthMonitorReport.java | 9 +- .../oodt/pcs/health/WorkflowStatesMetKeys.java | 4 +- .../apache/oodt/pcs/listing/ListingConf.java | 18 +- .../oodt/pcs/listing/ListingConfKeys.java | 12 +- .../oodt/pcs/metadata/PCSConfigMetadata.java | 48 +- .../apache/oodt/pcs/metadata/PCSMetadata.java | 50 +- .../org/apache/oodt/pcs/pedigree/Pedigree.java | 29 +- .../apache/oodt/pcs/pedigree/PedigreeTree.java | 5 +- .../oodt/pcs/pedigree/PedigreeTreeNode.java | 3 +- .../apache/oodt/pcs/query/AbstractPCSQuery.java | 5 +- .../org/apache/oodt/pcs/query/PCSQuery.java | 2 +- .../apache/oodt/pcs/tools/PCSHealthMonitor.java | 171 +- .../apache/oodt/pcs/tools/PCSLongLister.java | 31 +- .../org/apache/oodt/pcs/tools/PCSTrace.java | 37 +- .../apache/oodt/pcs/util/FileManagerUtils.java | 36 +- .../oodt/pcs/util/WorkflowManagerUtils.java | 15 +- pcs/input/pom.xml | 84 +- .../oodt/pcs/input/PGEConfigFileKeys.java | 30 +- .../oodt/pcs/input/PGEConfigFileReader.java | 59 +- .../oodt/pcs/input/PGEConfigFileWriter.java | 65 +- .../oodt/pcs/input/PGEConfigurationFile.java | 4 +- .../apache/oodt/pcs/input/PGEDataHandler.java | 17 +- .../apache/oodt/pcs/input/PGEDataParseKeys.java | 30 +- .../org/apache/oodt/pcs/input/PGEGroup.java | 42 +- .../apache/oodt/pcs/input/PGEXMLFileUtils.java | 76 +- .../oodt/pcs/input/PGEConfigFileReaderTest.java | 2 +- .../oodt/pcs/input/PGEConfigFileWriterTest.java | 2 +- .../oodt/pcs/input/PGEDataHandlerTest.java | 2 +- pcs/opsui/pom.xml | 392 +-- .../java/org/apache/oodt/pcs/opsui/BasePage.css | 8 +- .../apache/oodt/pcs/opsui/BasePage_classic.css | 36 +- .../oodt/pcs/opsui/BasePage_cleanwhite.css | 14 +- .../apache/oodt/pcs/opsui/BasePage_navyblue.css | 14 +- .../java/org/apache/oodt/pcs/opsui/HomePage.css | 4 +- .../oodt/pcs/opsui/HomePage_cleanwhite.css | 8 +- .../apache/oodt/pcs/opsui/HomePage_navyblue.css | 8 +- .../org/apache/oodt/pcs/opsui/OpsuiApp.java | 31 +- .../config/filemgr/FileManagerConfigPage.css | 4 +- .../apache/oodt/pcs/opsui/status/StatusPage.css | 2 +- .../oodt/pcs/opsui/status/StatusPage.java | 3 +- pcs/services/pom.xml | 50 +- .../oodt/pcs/services/HealthResource.java | 56 +- .../apache/oodt/pcs/services/PCSService.java | 6 +- .../oodt/pcs/services/PedigreeResource.java | 12 +- .../services/config/PCSServiceConfMetKeys.java | 16 +- .../pcs/services/config/PCSServiceConfig.java | 4 +- pge/pom.xml | 180 +- .../oodt/cas/pge/ConfigFilePropertyAdder.java | 2 +- .../java/org/apache/oodt/cas/pge/PGETask.java | 21 +- .../apache/oodt/cas/pge/PGETaskInstance.java | 186 +- .../oodt/cas/pge/config/FileStagingInfo.java | 9 +- .../oodt/cas/pge/config/PgeConfigBuilder.java | 2 +- .../oodt/cas/pge/config/PgeConfigMetKeys.java | 70 +- .../cas/pge/config/XmlFilePgeConfigBuilder.java | 47 +- .../oodt/cas/pge/exceptions/PGEException.java | 16 + .../oodt/cas/pge/metadata/PgeMetadata.java | 5 +- .../oodt/cas/pge/metadata/PgeTaskMetKeys.java | 2 +- .../cas/pge/staging/FileManagerFileStager.java | 6 +- .../apache/oodt/cas/pge/staging/FileStager.java | 47 +- .../cas/pge/util/GenericPgeObjectFactory.java | 23 +- .../org/apache/oodt/cas/pge/util/XmlHelper.java | 165 +- .../cas/pge/writers/CsvConfigFileWriter.java | 21 +- .../pge/writers/DynamicConfigFileWriter.java | 7 +- .../pge/writers/ExternExtractorMetWriter.java | 26 +- .../pge/writers/FilenameExtractorWriter.java | 10 +- .../MetadataKeyReplacerTemplateWriter.java | 15 +- .../oodt/cas/pge/writers/PcsMetFileWriter.java | 48 +- .../cas/pge/writers/SciPgeConfigFileWriter.java | 4 +- .../cas/pge/writers/TextConfigFileWriter.java | 18 +- .../pge/writers/VelocityConfigFileWriter.java | 14 +- .../metlist/MetadataListPcsMetFileWriter.java | 44 +- .../pge/writers/xslt/XslTransformWriter.java | 27 +- .../oodt/cas/pge/TestPGETaskInstance.java | 119 +- .../oodt/cas/pge/staging/TestFileStager.java | 2 +- ...etadataKeyReplacementTemplateWriterTest.java | 13 +- .../writers/VelocityConfigFileWriterTest.java | 11 +- pom.xml | 169 +- product/pom.xml | 210 +- .../oodt/product/LargeProductQueryHandler.java | 4 +- .../handlers/ofsn/AbstractCrawlLister.java | 40 +- .../product/handlers/ofsn/MD5GetHandler.java | 19 +- .../product/handlers/ofsn/OFSNFileHandler.java | 56 +- .../ofsn/OFSNFileHandlerConfiguration.java | 14 +- .../product/handlers/ofsn/OFSNGetHandler.java | 6 +- .../product/handlers/ofsn/OFSNListHandler.java | 4 +- .../handlers/ofsn/StdOFSNGetHandler.java | 11 +- .../product/handlers/ofsn/URLGetHandler.java | 50 +- .../handlers/ofsn/metadata/OFSNMetKeys.java | 10 +- .../ofsn/metadata/OFSNXMLConfigMetKeys.java | 26 +- .../handlers/ofsn/metadata/OFSNXMLMetKeys.java | 12 +- .../handlers/ofsn/metadata/OODTMetKeys.java | 2 +- .../handlers/ofsn/metadata/XMLQueryMetKeys.java | 4 +- .../handlers/ofsn/util/OFSNObjectFactory.java | 12 +- .../product/handlers/ofsn/util/OFSNUtils.java | 27 +- .../xmlquery/ChunkedProductInputStream.java | 75 +- .../org/apache/oodt/xmlquery/LargeResult.java | 28 +- product/src/site/xdoc/tutorials/qh/index.xml | 8 +- profile/pom.xml | 132 +- .../oodt/profile/EnumeratedProfileElement.java | 18 +- .../java/org/apache/oodt/profile/Profile.java | 96 +- .../apache/oodt/profile/ProfileAttributes.java | 62 +- .../org/apache/oodt/profile/ProfileElement.java | 132 +- .../oodt/profile/RangedProfileElement.java | 10 +- .../apache/oodt/profile/ResourceAttributes.java | 109 +- .../java/org/apache/oodt/profile/Utility.java | 28 +- .../apache/oodt/profile/gui/LeafListener.java | 71 +- .../oodt/profile/gui/ProfileBuilderGUI.java | 387 ++- .../gui/pstructs/ProfileAttributesPrinter.java | 43 +- .../gui/pstructs/ProfileElementPrinter.java | 30 +- .../profile/gui/pstructs/ProfilePrinter.java | 29 +- .../gui/pstructs/ResourceAttributesPrinter.java | 134 +- .../handlers/DatabaseProfileManager.java | 86 +- .../oodt/profile/handlers/ProfileHandler.java | 5 +- .../oodt/profile/handlers/ProfileManager.java | 19 +- .../profile/handlers/cas/CASProfileHandler.java | 60 +- .../profile/handlers/cas/util/ProfileUtils.java | 8 +- .../lightweight/ConstantExpression.java | 9 +- .../lightweight/LightweightProfileServer.java | 162 +- .../lightweight/OperatorExpression.java | 42 +- .../SearchableEnumeratedProfileElement.java | 12 +- .../lightweight/SearchableProfileElement.java | 1 - .../SearchableRangedProfileElement.java | 24 +- .../SearchableResourceAttributes.java | 146 +- .../profile/EnumeratedProfileElementTest.java | 2 +- .../oodt/profile/ProfileAttributesTest.java | 4 +- .../oodt/profile/ProfileElementTestCase.java | 2 +- .../org/apache/oodt/profile/ProfileTest.java | 2 +- .../oodt/profile/RangedProfileElementTest.java | 1 - .../oodt/profile/ResourceAttributesTest.java | 26 +- .../LightweightProfileServerTest.java | 27 +- .../resources/org/apache/oodt/profile/test.xml | 16 + profile/src/test/resources/test.xml | 16 + protocol/api/pom.xml | 235 +- .../org/apache/oodt/cas/protocol/Protocol.java | 24 +- .../oodt/cas/protocol/ProtocolFactory.java | 4 +- .../oodt/cas/protocol/auth/Authentication.java | 4 +- .../cli/action/BasicVerifyCliAction.java | 3 +- .../action/CrossProtocolTransferCliAction.java | 2 +- .../action/DeleteEmptyDirectoriesCliAction.java | 1 - .../protocol/cli/action/DownloadCliAction.java | 2 +- .../cas/protocol/config/ProtocolConfig.java | 13 +- .../protocol/config/SpringProtocolConfig.java | 4 +- .../cas/protocol/system/ProtocolManager.java | 6 +- .../cas/protocol/util/ProtocolFileFilter.java | 2 +- .../protocol/verify/BasicProtocolVerifier.java | 9 +- .../verify/BasicProtocolVerifierFactory.java | 4 +- .../cas/protocol/verify/ProtocolVerifier.java | 2 +- .../verify/ProtocolVerifierFactory.java | 2 +- .../oodt/cas/protocol/TestProtocolFile.java | 1 - .../protocol/auth/TestBasicAuthentication.java | 6 +- protocol/ftp/pom.xml | 181 +- .../cas/protocol/ftp/CogJGlobusFtpProtocol.java | 23 +- .../cas/protocol/ftp/CommonsNetFtpProtocol.java | 54 +- .../protocol/ftp/TestCogJGlobusFtpProtocol.java | 1 - protocol/http/pom.xml | 167 +- .../oodt/cas/protocol/http/HttpProtocol.java | 141 +- .../oodt/cas/protocol/http/util/HttpUtils.java | 7 +- .../oodt/cas/protocol/http/TestHttpFile.java | 4 +- .../cas/protocol/http/util/TestHttpUtils.java | 6 +- protocol/imaps/pom.xml | 166 +- .../oodt/cas/protocol/imaps/ImapsProtocol.java | 108 +- .../protocol/imaps/ImapsProtocolFactory.java | 3 +- .../cas/protocol/imaps/TestImapsProtocol.java | 2 +- protocol/sftp/pom.xml | 190 +- .../cas/protocol/sftp/JschSftpProtocol.java | 3 +- .../cas/protocol/sftp/TestJschSftpProtocol.java | 54 +- .../sftp/UnsupportedShellProcessProvider.java | 6 +- pushpull/pom.xml | 186 +- .../apache/oodt/cas/pushpull/config/Config.java | 14 +- .../oodt/cas/pushpull/config/ConfigMetKeys.java | 40 +- .../pushpull/config/ConfigParserMetKeys.java | 82 +- .../oodt/cas/pushpull/config/DaemonInfo.java | 41 +- .../oodt/cas/pushpull/config/ParserInfo.java | 6 +- .../oodt/cas/pushpull/config/PropFilesInfo.java | 15 +- .../oodt/cas/pushpull/config/ProtocolInfo.java | 15 +- .../oodt/cas/pushpull/config/RemoteSpecs.java | 619 ++--- .../oodt/cas/pushpull/config/SiteInfo.java | 61 +- .../apache/oodt/cas/pushpull/daemon/Daemon.java | 176 +- .../cas/pushpull/daemon/DaemonController.java | 16 +- .../cas/pushpull/daemon/DaemonLauncher.java | 17 +- .../pushpull/daemon/DaemonLauncherMBean.java | 8 +- .../cas/pushpull/daemon/DaemonListener.java | 8 +- .../oodt/cas/pushpull/daemon/DaemonMBean.java | 46 +- .../oodt/cas/pushpull/daemon/DaemonManager.java | 9 +- .../cas/pushpull/daemon/DaemonRmiInterface.java | 18 +- .../exceptions/RetrievalMethodException.java | 4 + .../pushpull/expressions/GlobalVariables.java | 4 +- .../oodt/cas/pushpull/expressions/Method.java | 79 +- .../cas/pushpull/expressions/ValidInput.java | 4 +- .../oodt/cas/pushpull/expressions/Variable.java | 8 +- .../filerestrictions/FileRestrictions.java | 23 +- .../cas/pushpull/filerestrictions/Parser.java | 2 +- .../pushpull/filerestrictions/VirtualFile.java | 74 +- .../parsers/ClassNoaaEmailParser.java | 35 +- .../parsers/DirStructXmlParser.java | 76 +- .../parsers/GenericEmailParser.java | 2 +- .../renamingconventions/RenamingConvention.java | 12 +- .../cas/pushpull/protocol/ProtocolHandler.java | 213 +- .../cas/pushpull/protocol/ProtocolPath.java | 19 +- .../oodt/cas/pushpull/protocol/RemoteSite.java | 38 +- .../pushpull/retrievalmethod/ListRetriever.java | 20 +- .../pushpull/retrievalmethod/RemoteCrawler.java | 36 +- .../retrievalmethod/RetrievalMethod.java | 6 +- .../DataFileToPropFileLinker.java | 46 +- .../retrievalsystem/DownloadListener.java | 6 +- .../DownloadThreadEvaluator.java | 41 +- .../retrievalsystem/FileRetrievalSystem.java | 282 +-- .../pushpull/retrievalsystem/RemoteFile.java | 8 +- .../retrievalsystem/RemoteFileMetKeys.java | 26 +- .../retrievalsystem/RetrievalSetup.java | 74 +- .../cas/pushpull/util/ExpressionValidator.java | 10 +- resource/pom.xml | 202 +- .../oodt/cas/resource/batchmgr/Batchmgr.java | 16 +- .../cas/resource/batchmgr/BatchmgrFactory.java | 2 +- .../cas/resource/batchmgr/XmlRpcBatchMgr.java | 36 +- .../batchmgr/XmlRpcBatchMgrFactory.java | 1 - .../resource/batchmgr/XmlRpcBatchMgrProxy.java | 49 +- .../cli/action/GetExecReportCliAction.java | 5 +- .../cli/action/GetJobInfoCliAction.java | 3 +- .../cli/action/GetNodeByIdCliAction.java | 4 - .../cli/action/GetNodeReportCliAction.java | 5 +- .../cli/action/GetNodesInQueueCliAction.java | 3 +- .../resource/cli/action/GetQueuesCliAction.java | 5 +- .../cli/action/GetQueuesWithNodeCliAction.java | 3 +- .../oodt/cas/resource/examples/LongJob.java | 12 +- .../oodt/cas/resource/examples/TestResmgr.java | 12 +- .../resource/exceptions/ResourceException.java | 31 + .../oodt/cas/resource/jobqueue/JobQueue.java | 18 +- .../cas/resource/jobqueue/JobQueueFactory.java | 2 +- .../oodt/cas/resource/jobqueue/JobStack.java | 11 +- .../cas/resource/jobrepo/JobRepository.java | 12 +- .../resource/jobrepo/JobRepositoryFactory.java | 2 +- .../resource/jobrepo/MemoryJobRepository.java | 11 +- .../resource/jobrepo/XStreamJobRepository.java | 25 +- .../jobrepo/XStreamJobRepositoryFactory.java | 14 +- .../oodt/cas/resource/metadata/JobMetadata.java | 4 +- .../cas/resource/monitor/AssignmentMonitor.java | 39 +- .../oodt/cas/resource/monitor/Monitor.java | 16 +- .../cas/resource/monitor/MonitorFactory.java | 2 +- .../monitor/ganglia/GangliaAdapter.java | 9 +- .../monitor/ganglia/GangliaMetKeys.java | 58 +- .../monitor/ganglia/GangliaResourceMonitor.java | 53 +- .../ganglia/GangliaResourceMonitorFactory.java | 15 +- .../monitor/ganglia/GangliaXMLParser.java | 6 +- .../monitor/ganglia/configuration/Metric.java | 8 +- .../ganglia/loadcalc/LoadCalculator.java | 2 +- .../ganglia/loadcalc/LoadCalculatorFactory.java | 2 +- .../cas/resource/monitor/utils/MockGmetad.java | 6 +- .../oodt/cas/resource/mux/BackendManager.java | 10 +- .../cas/resource/mux/BackendRepository.java | 2 +- .../resource/mux/BackendRepositoryFactory.java | 2 +- .../cas/resource/mux/QueueMuxBatchManager.java | 4 +- .../oodt/cas/resource/mux/QueueMuxMonitor.java | 19 +- .../cas/resource/mux/QueueMuxScheduler.java | 19 +- .../resource/mux/StandardBackendManager.java | 19 +- .../cas/resource/mux/XmlBackendRepository.java | 26 +- .../cas/resource/noderepo/NodeRepository.java | 2 +- .../noderepo/NodeRepositoryFactory.java | 2 +- .../resource/noderepo/XmlNodeRepository.java | 64 +- .../cas/resource/queuerepo/QueueRepository.java | 2 +- .../queuerepo/QueueRepositoryFactory.java | 2 +- .../resource/queuerepo/XmlQueueRepository.java | 155 +- .../cas/resource/scheduler/LRUScheduler.java | 14 +- .../cas/resource/scheduler/QueueManager.java | 61 +- .../oodt/cas/resource/scheduler/Scheduler.java | 12 +- .../resource/scheduler/SchedulerFactory.java | 2 +- .../oodt/cas/resource/structs/JobInput.java | 2 +- .../oodt/cas/resource/structs/JobStatus.java | 12 +- .../cas/resource/structs/NameValueJobInput.java | 20 +- .../resource/system/XmlRpcResourceManager.java | 164 +- .../system/XmlRpcResourceManagerClient.java | 88 +- .../resource/system/extern/XmlRpcBatchStub.java | 103 +- .../oodt/cas/resource/tools/JobSubmitter.java | 11 +- .../cas/resource/tools/RunDirJobSubmitter.java | 25 +- .../oodt/cas/resource/util/Configurable.java | 2 +- .../GenericResourceManagerObjectFactory.java | 104 +- .../oodt/cas/resource/util/JobBuilder.java | 18 +- .../apache/oodt/cas/resource/util/Ulimit.java | 54 +- .../oodt/cas/resource/util/UlimitMetKeys.java | 22 +- .../oodt/cas/resource/util/UlimitProperty.java | 3 +- .../cas/resource/util/XmlRpcStructFactory.java | 53 +- .../oodt/cas/resource/util/XmlRpcWriteable.java | 4 +- .../cas/resource/util/XmlStructFactory.java | 39 +- .../cli/UseMockClientCmdLineActionStore.java | 2 +- .../cas/resource/jobqueue/TestJobStack.java | 2 +- .../resource/monitor/TestAssignmentMonitor.java | 7 +- .../monitor/TestGangliaResourceMonitor.java | 21 +- .../resource/monitor/TestGangliaXMLParser.java | 4 +- .../cas/resource/mux/TestQueueMuxBatchmgr.java | 2 +- .../cas/resource/mux/TestQueueMuxMonitor.java | 8 +- .../queuerepo/TestXmlQueueRepository.java | 20 +- .../system/TestXmlRpcResourceManager.java | 4 +- .../system/TestXmlRpcResourceManagerClient.java | 206 ++ sso/pom.xml | 47 +- .../org/apache/oodt/security/sso/DummyImpl.java | 12 +- .../apache/oodt/security/sso/OpenSSOImpl.java | 43 +- .../apache/oodt/security/sso/SingleSignOn.java | 12 +- .../oodt/security/sso/SingleSignOnFactory.java | 10 +- .../security/sso/opensso/IdentityDetails.java | 18 +- .../oodt/security/sso/opensso/SSOMetKeys.java | 46 +- .../oodt/security/sso/opensso/SSOProxy.java | 86 +- .../sso/opensso/SingleSignOnException.java | 11 + .../oodt/security/sso/opensso/UserDetails.java | 10 +- streaming/pom.xml | 5 +- .../resource/batchmgr/MesosBatchManager.java | 4 +- .../cas/resource/batchmgr/ResourceExecutor.java | 4 +- .../oodt/cas/resource/monitor/MesosMonitor.java | 4 +- .../ResourceMesosSchedulerFactory.java | 2 +- .../oodt/filemgrcheck/FilemgrCheckStep.java | 4 +- .../oodt/filemgrdelete/FilemgrDeleteStep.java | 2 +- .../apache/oodt/filemgrget/OODTProcesses.java | 4 +- .../oodt/filemgringest/FilemgrIngestStep.java | 2 +- .../filemgringest/FilemgrIngestStepDialog.java | 2 +- webapp/components/pom.xml | 300 +-- .../curation/workbench/Workbench.css | 49 +- .../curation/workbench/Workbench.html | 17 +- .../curation/workbench/Workbench.java | 4 +- .../curation/workbench/Workbench_wicket.css | 52 +- .../curation/workbench/jquery.alerts.css | 12 +- .../curation/workbench/jquery.alerts_wicket.css | 12 +- .../webcomponents/filemgr/FileManagerConn.java | 14 +- .../browser/metadata/MetadataBrowser.java | 89 +- .../browser/pagination/ProductPaginator.java | 14 +- .../browser/product/ProductRefsBrowser.java | 20 +- .../filemgr/browser/types/TypeBrowser.java | 27 +- .../filemgr/browser/types/Types.java | 24 +- .../workflow/event/EventToWorkflowViewer.java | 10 +- .../instance/WorkflowInstancesViewer.css | 2 +- .../instance/WorkflowInstancesViewer.java | 46 +- .../workflow/model/WorkflowViewer.css | 2 +- .../workflow/model/WorkflowViewer.java | 12 +- .../pcs/webcomponents/health/HealthMonitor.css | 2 +- .../pcs/webcomponents/health/HealthMonitor.java | 1 - .../health/VisibilityAndSortToggler.java | 10 +- .../webcomponents/health/VisibilityToggler.java | 7 +- .../oodt/pcs/webcomponents/trace/Trace.java | 1 - webapp/fmbrowser/pom.xml | 245 +- .../filemgr/webapp/browser/FMBrowserApp.java | 7 +- webapp/fmprod/pom.xml | 219 +- .../oodt/cas/product/CASProductHandler.java | 63 +- .../cas/product/CASProductHandlerMetKeys.java | 6 +- .../oodt/cas/product/data/DataDeliveryKeys.java | 8 +- .../cas/product/data/DataDeliveryServlet.java | 33 +- .../apache/oodt/cas/product/data/DataUtils.java | 77 +- .../product/data/DatasetDeliveryServlet.java | 52 +- .../product/exceptions/CasProductException.java | 27 + .../jaxrs/configurations/RdfConfiguration.java | 18 +- .../jaxrs/configurations/RssConfiguration.java | 2 +- .../filters/BackwardsCompatibleInterceptor.java | 4 +- .../jaxrs/resources/DatasetResource.java | 14 +- .../jaxrs/resources/TransfersResource.java | 3 +- .../jaxrs/services/CasProductJaxrsService.java | 41 +- .../jaxrs/servlets/CasProductJaxrsServlet.java | 8 +- .../cas/product/jaxrs/writers/RdfWriter.java | 2 +- .../cas/product/jaxrs/writers/RssWriter.java | 2 +- .../oodt/cas/product/rdf/ProductTypeFilter.java | 11 +- .../apache/oodt/cas/product/rdf/RDFConfig.java | 24 +- .../oodt/cas/product/rdf/RDFConfigMetKeys.java | 2 +- .../cas/product/rdf/RDFConfigReaderMetKeys.java | 44 +- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 86 +- .../oodt/cas/product/rdf/RDFProductServlet.java | 113 +- .../apache/oodt/cas/product/rdf/RDFUtils.java | 8 +- .../oodt/cas/product/rss/RSSConfigMetKeys.java | 4 +- .../cas/product/rss/RSSConfigReaderMetKeys.java | 20 +- .../oodt/cas/product/rss/RSSProductServlet.java | 94 +- .../product/rss/RSSProductTransferServlet.java | 166 +- .../apache/oodt/cas/product/rss/RSSUtils.java | 5 +- .../oodt/cas/product/data/TestDataUtils.java | 2 +- webapp/wmonitor/pom.xml | 257 +- workflow/pom.xml | 294 +-- .../cli/action/DynWorkflowCliAction.java | 2 +- .../cli/action/GetFirstPageCliAction.java | 4 +- .../cli/action/GetLastPageCliAction.java | 4 +- .../cli/action/GetNextPageCliAction.java | 4 +- .../cli/action/GetPrevPageCliAction.java | 4 +- .../cli/action/GetTaskByIdCliAction.java | 16 +- .../cli/action/GetWorkflowByIdCliAction.java | 13 +- .../cli/action/GetWorkflowInstMetCliAction.java | 2 +- .../action/GetWorkflowsByEventCliAction.java | 10 +- .../workflow/cli/action/SendEventCliAction.java | 2 +- .../IterativeWorkflowProcessorThread.java | 57 +- .../PrioritizedQueueBasedWorkflowEngine.java | 16 +- ...oritizedQueueBasedWorkflowEngineFactory.java | 8 +- .../oodt/cas/workflow/engine/TaskQuerier.java | 26 +- .../oodt/cas/workflow/engine/TaskRunner.java | 21 +- .../engine/ThreadPoolWorkflowEngine.java | 45 +- .../cas/workflow/engine/WorkflowEngine.java | 22 +- .../workflow/engine/WorkflowEngineFactory.java | 2 +- .../engine/processor/ConditionProcessor.java | 4 +- .../engine/processor/SequentialProcessor.java | 11 +- .../engine/processor/TaskProcessor.java | 20 +- .../engine/processor/WorkflowProcessor.java | 37 +- .../processor/WorkflowProcessorBuilder.java | 9 +- .../processor/WorkflowProcessorHelper.java | 180 +- .../processor/WorkflowProcessorListener.java | 2 +- .../processor/WorkflowProcessorQueue.java | 65 +- .../engine/runner/AbstractEngineRunnerBase.java | 28 +- .../runner/AsynchronousLocalEngineRunner.java | 28 +- .../AsynchronousLocalEngineRunnerFactory.java | 4 - .../workflow/engine/runner/EngineRunner.java | 14 +- .../engine/runner/EngineRunnerFactory.java | 2 +- .../workflow/engine/runner/ResourceRunner.java | 25 +- .../cas/workflow/examples/BranchRedirector.java | 2 +- .../workflow/examples/CheckForMetadataKeys.java | 5 +- .../examples/ExternScriptTaskInstance.java | 51 +- .../cas/workflow/examples/LongCondition.java | 4 +- .../oodt/cas/workflow/examples/LongTask.java | 6 +- .../oodt/cas/workflow/examples/MailTask.java | 18 +- .../examples/PrerequisiteCondition.java | 97 + .../examples/RandomStatusUpdateTask.java | 32 +- .../workflow/examples/ResmgrJobCondition.java | 100 + .../workflow/exceptions/WorkflowException.java | 11 + .../AbstractPaginatibleInstanceRepository.java | 16 +- .../DataSourceWorkflowInstanceRepository.java | 143 +- ...SourceWorkflowInstanceRepositoryFactory.java | 28 +- .../LuceneWorkflowInstanceRepository.java | 132 +- ...LuceneWorkflowInstanceRepositoryFactory.java | 6 +- .../MemoryWorkflowInstanceRepository.java | 24 +- ...MemoryWorkflowInstanceRepositoryFactory.java | 6 +- .../instrepo/WorkflowInstanceMetMap.java | 7 +- .../instrepo/WorkflowInstanceMetMapKeys.java | 12 +- .../WorkflowInstanceMetadataReader.java | 29 +- .../instrepo/WorkflowInstanceRepository.java | 18 +- .../WorkflowInstanceRepositoryFactory.java | 2 +- .../workflow/lifecycle/WorkflowLifecycle.java | 31 +- .../lifecycle/WorkflowLifecycleManager.java | 36 +- .../lifecycle/WorkflowLifecycleMetKeys.java | 12 +- .../lifecycle/WorkflowLifecycleStage.java | 2 +- .../lifecycle/WorkflowLifecyclesReader.java | 29 +- .../cas/workflow/lifecycle/WorkflowState.java | 22 +- .../oodt/cas/workflow/metadata/CoreMetKeys.java | 18 +- .../DataSourceWorkflowRepository.java | 264 +- .../DataSourceWorkflowRepositoryFactory.java | 11 +- .../repository/PackagedWorkflowRepository.java | 133 +- .../PackagedWorkflowRepositoryFactory.java | 16 +- .../workflow/repository/WorkflowRepository.java | 32 +- .../repository/WorkflowRepositoryFactory.java | 2 +- .../repository/XMLWorkflowRepository.java | 585 +++-- .../workflow/structs/ConditionTaskInstance.java | 10 +- .../apache/oodt/cas/workflow/structs/Graph.java | 24 +- .../structs/HighestFIFOPrioritySorter.java | 16 +- .../workflow/structs/HighestPrioritySorter.java | 2 +- .../workflow/structs/ParentChildWorkflow.java | 2 +- .../oodt/cas/workflow/structs/Priority.java | 24 +- .../cas/workflow/structs/PrioritySorter.java | 2 +- .../oodt/cas/workflow/structs/TaskJob.java | 8 +- .../oodt/cas/workflow/structs/TaskJobInput.java | 37 +- .../cas/workflow/structs/WorkflowCondition.java | 2 - .../structs/WorkflowConditionInstance.java | 2 +- .../cas/workflow/structs/WorkflowInstance.java | 34 +- .../workflow/structs/WorkflowInstancePage.java | 2 - .../cas/workflow/structs/WorkflowStatus.java | 16 +- .../oodt/cas/workflow/structs/WorkflowTask.java | 2 +- .../workflow/structs/WorkflowTaskInstance.java | 2 +- .../workflow/system/XmlRpcWorkflowManager.java | 1097 +++++---- .../system/XmlRpcWorkflowManagerClient.java | 569 ++--- .../cas/workflow/tools/InstanceRepoCleaner.java | 33 +- .../cas/workflow/util/CygwinScriptFile.java | 13 +- .../oodt/cas/workflow/util/DbStructFactory.java | 15 +- .../util/GenericWorkflowObjectFactory.java | 121 +- .../oodt/cas/workflow/util/Pagination.java | 21 +- .../oodt/cas/workflow/util/ScriptFile.java | 35 +- .../cas/workflow/util/XmlRpcStructFactory.java | 202 +- .../cas/workflow/util/XmlStructFactory.java | 79 +- workflow/src/site/resources/css/guides.css | 2 +- .../cli/UseMockClientCmdLineActionStore.java | 10 +- .../workflow/engine/MetSetterTaskQuerier.java | 2 +- .../cas/workflow/engine/MockProcessorQueue.java | 11 +- .../workflow/engine/QuerierAndRunnerUtils.java | 5 +- .../oodt/cas/workflow/engine/SimpleTester.java | 16 +- .../TestAsynchronousLocalEngineRunner.java | 34 +- .../cas/workflow/engine/TestTaskQuerier.java | 8 +- .../cas/workflow/engine/TestTaskRunner.java | 4 +- .../engine/TestThreadPoolWorkflowEngine.java | 20 +- .../examples/TestExternScriptTaskInstance.java | 13 +- .../cas/workflow/examples/TestFilterTask.java | 18 +- .../TestLuceneWorkflowInstanceRepository.java | 13 +- .../repository/MockWorkflowRepository.java | 3 +- .../TestPackagedWorkflowRepository.java | 36 +- .../TestWorkflowDataSourceRepository.java | 364 ++- .../repository/TestWorkflowRepository.java | 51 +- .../structs/TestFILOPrioritySorter.java | 3 +- .../structs/TestHighestFIFOPrioritySorter.java | 3 +- .../structs/TestHighestPrioritySorter.java | 3 +- .../system/MockXmlRpcWorkflowManagerClient.java | 76 +- .../system/TestXmlRpcWorkflowManager.java | 18 +- .../system/TestXmlRpcWorkflowManagerClient.java | 556 ++++- workflow/src/test/resources/workflow.sql | 8 + xmlps/pom.xml | 253 +- .../oodt/xmlps/exceptions/XmlpsException.java | 27 + .../oodt/xmlps/mapping/DatabaseTableGroup.java | 5 +- .../org/apache/oodt/xmlps/mapping/Mapping.java | 10 +- .../apache/oodt/xmlps/mapping/MappingField.java | 37 +- .../oodt/xmlps/mapping/MappingReader.java | 35 +- .../xmlps/mapping/MappingReaderMetKeys.java | 36 +- .../oodt/xmlps/mapping/funcs/MappingFunc.java | 6 +- .../apache/oodt/xmlps/product/DBMSExecutor.java | 10 +- .../oodt/xmlps/product/XMLPSProductHandler.java | 44 +- .../apache/oodt/xmlps/profile/DBMSExecutor.java | 17 +- .../oodt/xmlps/profile/XMLPSProfileHandler.java | 39 +- .../oodt/xmlps/queryparser/Expression.java | 2 +- .../xmlps/queryparser/HandlerQueryParser.java | 29 +- .../oodt/xmlps/queryparser/ParseConstants.java | 38 +- .../oodt/xmlps/queryparser/WildcardLiteral.java | 4 +- .../apache/oodt/xmlps/structs/CDEResult.java | 25 +- .../xmlps/structs/CDEResultInputStream.java | 20 +- .../org/apache/oodt/xmlps/structs/CDERow.java | 8 +- .../xmlps/util/GenericCDEObjectFactory.java | 11 +- .../apache/oodt/xmlps/util/XMLQueryKeys.java | 4 +- .../oodt/xmlps/mapping/TestMappingReader.java | 7 +- .../xmlps/product/TestXMLPSProductHandler.java | 4 +- .../xmlps/structs/TestCDEResultInputStream.java | 6 +- xmlquery/pom.xml | 62 +- .../java/org/apache/oodt/product/Retriever.java | 2 +- .../apache/oodt/xmlquery/ByteArrayCodec.java | 13 +- .../org/apache/oodt/xmlquery/CodecFactory.java | 16 +- .../oodt/xmlquery/CompressedObjectCodec.java | 13 +- .../oodt/xmlquery/CompressedStringCodec.java | 41 +- .../java/org/apache/oodt/xmlquery/Header.java | 51 +- .../org/apache/oodt/xmlquery/ObjectCodec.java | 13 +- .../org/apache/oodt/xmlquery/QueryElement.java | 37 +- .../org/apache/oodt/xmlquery/QueryHeader.java | 60 +- .../org/apache/oodt/xmlquery/QueryResult.java | 53 +- .../java/org/apache/oodt/xmlquery/Result.java | 133 +- .../java/org/apache/oodt/xmlquery/Results.java | 1 - .../org/apache/oodt/xmlquery/Statistic.java | 25 +- .../org/apache/oodt/xmlquery/StringCodec.java | 2 +- .../java/org/apache/oodt/xmlquery/XMLQuery.java | 168 +- .../apache/oodt/xmlquery/CodecFactoryTest.java | 2 +- .../org/apache/oodt/xmlquery/CodecTest.java | 3 - .../xmlquery/CompressedObjectCodecTest.java | 6 - .../xmlquery/CompressedStringCodecTest.java | 7 +- .../oodt/xmlquery/EmptyByteArrayCodecTest.java | 6 - .../org/apache/oodt/xmlquery/HeaderTest.java | 4 +- .../apache/oodt/xmlquery/ObjectCodecTest.java | 6 - .../apache/oodt/xmlquery/QueryElementTest.java | 3 - .../org/apache/oodt/xmlquery/ResultTest.java | 4 +- .../apache/oodt/xmlquery/StringCodecTest.java | 7 +- .../org/apache/oodt/xmlquery/XMLQueryTest.java | 2 - 1082 files changed, 29937 insertions(+), 26289 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java ---------------------------------------------------------------------- diff --cc app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java index e012cf6,ef7109e..d8a7793 --- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java +++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java @@@ -38,10 -32,11 +33,11 @@@ import java.util.logging.Logger public class CasDB { + public static final int INT = 20; URL filemgrUrl; - XmlRpcFileManagerClient client; + FileManagerClient client; public Results results; - + private static Logger LOG = Logger.getLogger(CasDB.class.getName()); private static String freeTextBlock = "__FREE__"; public CasDB() { http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FilemgrUniquenessChecker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/crawler/src/main/java/org/apache/oodt/cas/crawl/action/WorkflowMgrStatusUpdate.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/pom.xml ---------------------------------------------------------------------- diff --cc filemgr/pom.xml index a6abbca,f85b88b..d526109 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@@ -62,64 -210,11 +209,12 @@@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - </plugin> - <plugin> - <groupId>org.apache.avro</groupId> - <artifactId>avro-maven-plugin</artifactId> - <version>1.7.7</version> - <configuration> - <stringType>String</stringType> - <detail>true</detail> - </configuration> - <executions> - <execution> - <id>schemas</id> - <configuration> - <imports> - <import>${basedir}/src/main/avro/types/AvroMimeType.avsc</import> - <import>${basedir}/src/main/avro/types/AvroReference.avsc</import> - <import>${basedir}/src/main/avro/types/AvroExtractorSpec.avsc</import> - <import>${basedir}/src/main/avro/types/AvroMetadata.avsc</import> - <import>${basedir}/src/main/avro/types/AvroTypeHandler.avsc</import> - <import>${basedir}/src/main/avro/types/AvroProductType.avsc</import> - <import>${basedir}/src/main/avro/types/AvroProduct.avsc</import> - <import>${basedir}/src/main/avro/types/AvroFileTransferStatus.avsc</import> - <import>${basedir}/src/main/avro/types/AvroQueryCriteria.avsc</import> - <import>${basedir}/src/main/avro/types/AvroQuery.avsc</import> - <import>${basedir}/src/main/avro/types/AvroProductPage.avsc</import> - <import>${basedir}/src/main/avro/types/AvroElement.avsc</import> - <import>${basedir}/src/main/avro/types/AvroQueryResult.avsc</import> - <import>${basedir}/src/main/avro/types/AvroFilterAlgor.avsc</import> - <import>${basedir}/src/main/avro/types/AvroQueryFilter.avsc</import> - <import>${basedir}/src/main/avro/types/AvroComplexQuery.avsc</import> - </imports> - </configuration> - <goals> - <goal>schema</goal> - </goals> - </execution> - <execution> - <id>protocol</id> - <configuration> - <imports> - <import>${basedir}/src/main/avro/types</import> - </imports> - </configuration> - <goals> - <goal>idl-protocol</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> <configuration> + <forkCount>0</forkCount> <!--forkMode>pertest</forkMode--> - <forkMode>none</forkMode> <!-- so we can DEBUG --> + <forkMode>none</forkMode> + <!-- so we can DEBUG --> <argLine>-enableassertions</argLine> <useSystemClassLoader>false</useSystemClassLoader> <systemProperties> http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java ---------------------------------------------------------------------- diff --cc filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java index 855f570,f28cf92..8d97b8d --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DeleteProductByIdCliAction.java @@@ -33,13 -39,13 +39,13 @@@ public class DeleteProductByIdCliActio private String productId; @Override - public Product getProductToDelete() throws Exception { + public Product getProductToDelete() throws CatalogException, ConnectionException, MalformedURLException { Validate.notNull(productId, "Must specify productId"); - XmlRpcFileManagerClient client = getClient(); + FileManagerClient client = getClient(); Product p = client.getProductById(productId); if (p == null) { - throw new Exception("FileManager returned null for product '" + throw new CatalogException("FileManager returned null for product '" + productId + "'"); } return p; http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/IngestProductCliAction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java ---------------------------------------------------------------------- diff --cc filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java index 795ab01,c668649..2ff757d --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/RetrieveFilesCliAction.java @@@ -42,9 -42,9 +42,9 @@@ public class RetrieveFilesCliAction ext public void execute(ActionMessagePrinter printer) throws CmdLineActionException { try { - XmlRpcFileManagerClient fmClient = getClient(); + FileManagerClient fmClient = getClient(); dt.setFileManagerUrl(fmClient.getFileManagerUrl()); - Product product = null; + Product product; if (productId != null) { product = fmClient.getProductById(productId); } else if (productName != null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/RemoteDataTransferer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/LocalCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fa572a2e/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java ----------------------------------------------------------------------
