Merge pull request #2 from fgreg/SDAP-10

SDAP-10 Pull in changes from dataplumber/nexus image-gen

Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/commit/ecf6a601
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/tree/ecf6a601
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/diff/ecf6a601

Branch: refs/heads/master
Commit: ecf6a601a48941653bec04604e76dcd8cb53420c
Parents: 0c83a10 1cf5b3a
Author: fgreg <[email protected]>
Authored: Wed Jan 10 17:06:16 2018 -0800
Committer: GitHub <[email protected]>
Committed: Wed Jan 10 17:06:16 2018 -0800

----------------------------------------------------------------------
 analysis/.DS_Store                              |  Bin 6148 -> 0 bytes
 analysis/setup.py                               |    5 +-
 analysis/webservice/GenerateImageMRF.py         |  311 ++
 analysis/webservice/WorkflowDriver.py           |   67 +
 .../webservice/algorithms/ColorBarHandler.py    |  140 +
 .../webservice/algorithms/MapFetchHandler.py    |  345 ++
 analysis/webservice/algorithms/colortables.py   |  535 ++
 .../algorithms/imaging/Roboto/LICENSE.txt       |  202 +
 .../algorithms/imaging/Roboto/Roboto-Bold.ttf   |  Bin 0 -> 162464 bytes
 .../webservice/algorithms/imaging/__init__.py   |    5 +
 analysis/webservice/config/web.ini              |    2 +-
 analysis/webservice/resources/transparent.png   |  Bin 0 -> 1397 bytes
 analysis/webservice/resources/wkt.txt           |   10 +
 data-access/nexustiles/dao/SolrProxy.pyx        |   62 +
 data-access/nexustiles/nexustiles.py            |   12 +
 docker/nexus-imaging/Dockerfile                 |   10 +
 docker/nexus-imaging/docker-entrypoint.sh       |    8 +
 docker/nexus-imaging/setupall.sh                |   18 +
 nexus-ingest/nexus-messages/build.gradle        |    2 +-
 .../reports/license/dependency-license.html     |   62 -
 .../reports/license/dependency-license.xml      |    6 -
 .../reports/license/license-dependency.html     |   69 -
 .../reports/license/license-dependency.xml      |    5 -
 .../build/reports/project/dependencies.txt      |   43 -
 .../project/dependencies/css/base-style.css     |  179 -
 .../reports/project/dependencies/css/style.css  |   84 -
 .../reports/project/dependencies/css/tree.css   |  102 -
 .../reports/project/dependencies/images/d.gif   |  Bin 2944 -> 0 bytes
 .../reports/project/dependencies/images/d.png   |  Bin 7635 -> 0 bytes
 .../project/dependencies/images/throbber.gif    |  Bin 1849 -> 0 bytes
 .../reports/project/dependencies/index.html     |   44 -
 .../project/dependencies/js/jquery.jstree.js    | 4564 ------------------
 .../dependencies/js/jquery.min-1.11.0.js        |    4 -
 .../reports/project/dependencies/js/script.js   |  202 -
 .../reports/project/dependencies/root.html      |   40 -
 .../build/reports/project/dependencies/root.js  |    1 -
 .../build/reports/project/properties.txt        |  128 -
 .../build/reports/project/tasks.txt             |   68 -
 38 files changed, 1731 insertions(+), 5604 deletions(-)
----------------------------------------------------------------------


Reply via email to