Merge branch 'master' into feature/zookeeper-config
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/905bb87c Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/905bb87c Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/905bb87c Branch: refs/heads/feature/zookeeper-config Commit: 905bb87c7df008d3784e5733f269a302680810e0 Parents: 1d70bd5 a721243 Author: Chris Mattmann <mattm...@apache.org> Authored: Wed Aug 9 22:32:41 2017 -0700 Committer: Chris Mattmann <mattm...@apache.org> Committed: Wed Aug 9 22:32:41 2017 -0700 ---------------------------------------------------------------------- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 120 ++++++++++--------- .../oodt/cas/filemgr/structs/Element.java | 10 ++ .../oodt/cas/filemgr/structs/ProductType.java | 14 +++ .../cas/filemgr/system/XmlRpcFileManager.java | 2 +- .../apache/oodt/pcs/util/FileManagerUtils.java | 98 ++++++++++----- .../webcomponents/filemgr/FileManagerConn.java | 42 +++++-- 6 files changed, 191 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/905bb87c/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java ----------------------------------------------------------------------