Merge branch 'development' of https://github.com/IMS94/oodt into development
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/72c1b2e5 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/72c1b2e5 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/72c1b2e5 Branch: refs/heads/development Commit: 72c1b2e58771ba63bad1d4caec7ec432cec81887 Parents: d63616b 36f320e Author: Chris Mattmann <[email protected]> Authored: Mon Feb 26 20:22:12 2018 -0800 Committer: Chris Mattmann <[email protected]> Committed: Mon Feb 26 20:22:12 2018 -0800 ---------------------------------------------------------------------- core/pom.xml | 10 + filemgr/pom.xml | 4 - filemgr/src/main/assembly/assembly.xml | 6 +- .../filemgr/system/AvroFileManagerClient.java | 335 ++----------------- .../filemgr/system/AvroFileManagerServer.java | 2 +- .../filemgr/util/RpcCommunicationFactory.java | 2 + filemgr/src/main/resources/filemgr.properties | 8 +- .../system/AbstractFileManagerServerTest.java | 172 ++++++++++ .../system/TestAvroFileManagerClient.java | 220 ++++++++++++ .../system/TestAvroFileManagerServer.java | 155 +++++++++ .../cas/filemgr/system/TestRpcFileManager.java | 1 + .../system/TestRpcFileManagerClient.java | 1 + .../filemgr/system/TestXmlRpcFileManager.java | 303 ----------------- .../system/TestXmlRpcFileManagerClient.java | 268 ++++----------- .../system/TestXmlRpcFileManagerServer.java | 149 +++++++++ .../TestDistributedXmlRpcFileManager.java | 4 +- 16 files changed, 805 insertions(+), 835 deletions(-) ----------------------------------------------------------------------
