fix merge
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ab366e2a Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ab366e2a Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ab366e2a Branch: refs/heads/master Commit: ab366e2a648df7c7ac37aaa1c49d1d98a1aeb20c Parents: 78ce45e 07d9030 Author: Tom Barber <[email protected]> Authored: Wed Jul 26 13:16:15 2017 +0100 Committer: Tom Barber <[email protected]> Committed: Wed Jul 26 13:16:15 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 21 +- app/fmbrowser/pom.xml | 1 + .../cas/filemgr/browser/model/QueryBuilder.java | 30 +- app/weditor/.gitignore | 1 + catalog/.gitignore | 1 + catalog/pom.xml | 15 + commons/.gitignore | 1 + .../apache/oodt/commons/exec/EnvUtilities.java | 16 +- .../oodt/commons/exec/TestEnvUtilities.java | 9 + core/pom.xml | 50 ++- crawler/.gitignore | 1 + crawler/pom.xml | 14 + .../cas/crawl/MetExtractorProductCrawler.java | 37 +- .../oodt/cas/crawl/StdProductCrawler.java | 16 +- .../cas/crawl/action/SolrIndexingAction.java | 18 +- curator/webapp/pom.xml | 12 - docker/Dockerfile | 6 +- filemgr/pom.xml | 11 +- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 430 +++++++++++-------- .../filemgr/catalog/LuceneCatalogFactory.java | 18 +- .../cli/action/LuceneQueryCliAction.java | 33 +- .../oodt/cas/filemgr/tools/CASAnalyzer.java | 37 +- .../oodt/cas/filemgr/tools/CatalogSearch.java | 26 +- .../filemgr/tools/OptimizeLuceneCatalog.java | 24 +- .../oodt/cas/filemgr/tools/QueryTool.java | 23 +- .../cas/filemgr/tools/RangeQueryTester.java | 50 ++- .../cas/filemgr/catalog/TestLuceneCatalog.java | 4 +- metadata/.gitignore | 1 + opendapps/pom.xml | 6 +- .../apache/oodt/opendapps/DatasetExtractor.java | 5 + pcs/input/.gitignore | 1 + product/.gitignore | 1 + protocol/api/.gitignore | 1 + protocol/ftp/.gitignore | 1 + protocol/http/.gitignore | 1 + protocol/imaps/.gitignore | 1 + protocol/sftp/.gitignore | 1 + workflow/pom.xml | 4 + .../LuceneWorkflowInstanceRepository.java | 320 ++++++++------ ...LuceneWorkflowInstanceRepositoryFactory.java | 25 +- .../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 xmlps/.gitignore | 1 + xmlquery/.gitignore | 1 + 55 files changed, 825 insertions(+), 452 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/ab366e2a/catalog/pom.xml ---------------------------------------------------------------------- diff --cc catalog/pom.xml index 07805a3,fa13c3a..cc73c07 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@@ -60,9 -60,24 +60,24 @@@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.solr</groupId> + <artifactId>solr-lucene-core</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/ab366e2a/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/ab366e2a/crawler/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/ab366e2a/filemgr/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/ab366e2a/workflow/pom.xml ----------------------------------------------------------------------
