[Opengeoscience-developers] OpenGeoscience branch, next, updated. ce3e40db3e60d399949d1ed2043170c2f4369fa4
Ben Burnett
bburnett at poly.edu
Fri Aug 16 14:28:31 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".
The branch, next has been updated
via ce3e40db3e60d399949d1ed2043170c2f4369fa4 (commit)
via 65a626d121ba2c5b3d96b2783d101ca4f4094327 (commit)
via 46500e0e91136fbfaba2bc33110526f67b753927 (commit)
via bf669a84d2418063a3e696ef908d9ff6dc1e52e5 (commit)
via 2870756fdb7af06850717bfac81051f50c85beac (commit)
via 5ea789e3af2084c7a6f45230297d9c1b5ff511e0 (commit)
via aa1f0ec9b0cf61cbb6f9579e96111cf52e04d4ca (commit)
via 584b285e8c01d706190bbe0d5931b61f1b67f0f6 (commit)
via 3facecf52664ecd7968bbb0b41f8e60eae92c7da (commit)
via 0a53d087b3299e546e08033feeffa810154f2b31 (commit)
via 528cc558afd0974b8f595e58cd1e1270b0729fa6 (commit)
via 5cc90606d06916897da79bfc2694b89bd5257810 (commit)
via 03ba682c08324950e260593cab2a283076e55291 (commit)
via 8dd544ccfa8a6bf9dca6dabe6918b50f569b6a6a (commit)
via fceaf2b51a165726d6500c8670377e5d527f05bf (commit)
via 1cf703e7cb0a133e71a13c745d7838fe3a93d8af (commit)
via 39318167bc7e26f9e7456734381f836d47791e3f (commit)
via 47833c1a2becd014763381037a33c5861c89bf16 (commit)
via 71d56dd68675b607e85c8d7286c1f92411a6af4b (commit)
via dde67c3257f05ef4d76fc0838c00c70c833b7b48 (commit)
via a85e2541bb6a21f131b6dfba1813a475a3a6f8a1 (commit)
via 97ca0adc740bf1126763f4c64670c48253621069 (commit)
via e864488acd3283055b9c447e08d74b75b826f719 (commit)
via cadc7efae1a24f7368448cb2e1f7be75d9353087 (commit)
via 7e028eb326d4899d4946e159e4a695910a9207cf (commit)
via e4df9247c76e427e169fb7080b476ca767d40640 (commit)
via 0eeb6fe155635a8c5376e12862e5c5a3945e0658 (commit)
via a0b472979696f08e214353e3f97f255a0d7f5a37 (commit)
via 9a6b4107e6e6e95a9fe84e856da37ca817d124ef (commit)
from 6db3eba7e793219c8ccb2333d4abd3dd458ed12c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=ce3e40db3e60d399949d1ed2043170c2f4369fa4
commit ce3e40db3e60d399949d1ed2043170c2f4369fa4
Merge: 6db3eba 65a626d
Author: Ben Burnett <bburnett at poly.edu>
Date: Fri Aug 16 13:18:24 2013 -0400
Merge branch '54-2-workflow-construction' into next
Conflicts:
web/apps/archive/archive.js
.gitignore | 13 +-
CMakeLists.txt | 15 +-
geoweb.py | 13 +-
modules/geowebsocket.py | 2 +-
scripts/setup_path.sh | 3 +-
services/testworkflow.json | 1 +
services/testworkflowoutput.json | 1 +
utils/xml2json.py => services/vistrail.py | 158 ++-
temp/testService.py | 2 +-
utils/__init__.py | 27 +
utils/packages/geoweb.py | 4 -
web/apps/archive/10yearAverage.js | 1 -
web/apps/archive/archive.js | 80 +-
web/apps/archive/geowebRegistry.js | 2384 --------------------------
web/apps/archive/index.html | 31 +-
web/apps/archive/workflow.css | 27 -
web/apps/archive/workflow.html | 32 -
web/apps/archive/workflow.js | 241 ---
web/apps/archive/workflowStyle.js | 40 -
web/common/img/squairy_light.png | Bin 0 -> 24023 bytes
web/common/img/tweed.png | Bin 0 -> 21371 bytes
web/common/js/d3.v3.min.js | 2 +-
web/common/js/defs/EPSG42304.js | 2 +-
web/common/js/proj4.js | 2 +-
web/common/js/proj4.min.js | 2 +-
web/lib/geo/archiveLayerSource.js | 2 +-
web/lib/geo/featureCollection.js | 2 +-
web/lib/geo/featureLayer.js | 2 +-
web/lib/geo/geoTransform.js | 2 +-
web/lib/geo/layer.js | 2 +-
web/lib/geo/layerSource.js | 2 +-
web/lib/geo/mercator.js | 2 +-
web/lib/geo/prepareForRenderRequest.js | 2 +-
web/lib/geo/updateRequest.js | 2 +-
web/lib/ui/workflow.js | 1044 ------------
web/lib/vgl/data.js | 2 +-
web/lib/vgl/geomData.js | 2 +-
web/lib/vgl/legend.js | 2 +-
web/lib/vgl/utils.js | 2 +-
web/lib/wfl/connection.js | 103 ++
web/lib/wfl/geowebRegistry.js | 2642 +++++++++++++++++++++++++++++
web/lib/wfl/init.js | 7 +
web/lib/wfl/inputModule.js | 227 +++
web/lib/wfl/inputPort.js | 86 +
web/lib/wfl/outputPort.js | 58 +
web/lib/wfl/port.js | 117 ++
web/lib/wfl/staticWorkflows.js | 307 ++++
web/lib/wfl/workflow.js | 288 ++++
web/lib/wfl/workflowLayerSource.js | 110 ++
web/lib/wfl/workflowModule.js | 317 ++++
web/lib/wfl/workflowStyle.js | 52 +
web/lib/wfl/workflowUtils.js | 431 +++++
52 files changed, 4995 insertions(+), 3903 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 13 +-
CMakeLists.txt | 15 +-
geoweb.py | 13 +-
modules/geowebsocket.py | 2 +-
scripts/setup_path.sh | 3 +-
services/testworkflow.json | 1 +
services/testworkflowoutput.json | 1 +
utils/xml2json.py => services/vistrail.py | 158 ++-
temp/testService.py | 2 +-
utils/__init__.py | 27 +
utils/packages/geoweb.py | 4 -
web/apps/archive/10yearAverage.js | 1 -
web/apps/archive/archive.js | 80 +-
web/apps/archive/geowebRegistry.js | 2384 --------------------------
web/apps/archive/index.html | 31 +-
web/apps/archive/workflow.css | 27 -
web/apps/archive/workflow.html | 32 -
web/apps/archive/workflow.js | 241 ---
web/apps/archive/workflowStyle.js | 40 -
web/common/img/squairy_light.png | Bin 0 -> 24023 bytes
web/common/img/tweed.png | Bin 0 -> 21371 bytes
web/common/js/d3.v3.min.js | 2 +-
web/common/js/defs/EPSG42304.js | 2 +-
web/common/js/proj4.js | 2 +-
web/common/js/proj4.min.js | 2 +-
web/lib/geo/archiveLayerSource.js | 2 +-
web/lib/geo/featureCollection.js | 2 +-
web/lib/geo/featureLayer.js | 2 +-
web/lib/geo/geoTransform.js | 2 +-
web/lib/geo/layer.js | 2 +-
web/lib/geo/layerSource.js | 2 +-
web/lib/geo/mercator.js | 2 +-
web/lib/geo/prepareForRenderRequest.js | 2 +-
web/lib/geo/updateRequest.js | 2 +-
web/lib/ui/workflow.js | 1044 ------------
web/lib/vgl/data.js | 2 +-
web/lib/vgl/geomData.js | 2 +-
web/lib/vgl/legend.js | 2 +-
web/lib/vgl/utils.js | 2 +-
web/lib/wfl/connection.js | 103 ++
web/lib/wfl/geowebRegistry.js | 2642 +++++++++++++++++++++++++++++
web/lib/wfl/init.js | 7 +
web/lib/wfl/inputModule.js | 227 +++
web/lib/wfl/inputPort.js | 86 +
web/lib/wfl/outputPort.js | 58 +
web/lib/wfl/port.js | 117 ++
web/lib/wfl/staticWorkflows.js | 307 ++++
web/lib/wfl/workflow.js | 288 ++++
web/lib/wfl/workflowLayerSource.js | 110 ++
web/lib/wfl/workflowModule.js | 317 ++++
web/lib/wfl/workflowStyle.js | 52 +
web/lib/wfl/workflowUtils.js | 431 +++++
52 files changed, 4995 insertions(+), 3903 deletions(-)
create mode 100644 services/testworkflow.json
create mode 100644 services/testworkflowoutput.json
rename utils/xml2json.py => services/vistrail.py (51%)
mode change 100755 => 100644
create mode 100644 utils/__init__.py
delete mode 100644 web/apps/archive/10yearAverage.js
delete mode 100644 web/apps/archive/geowebRegistry.js
delete mode 100644 web/apps/archive/workflow.css
delete mode 100644 web/apps/archive/workflow.html
delete mode 100644 web/apps/archive/workflow.js
delete mode 100644 web/apps/archive/workflowStyle.js
create mode 100644 web/common/img/squairy_light.png
create mode 100644 web/common/img/tweed.png
delete mode 100644 web/lib/ui/workflow.js
create mode 100644 web/lib/wfl/connection.js
create mode 100644 web/lib/wfl/geowebRegistry.js
create mode 100644 web/lib/wfl/init.js
create mode 100644 web/lib/wfl/inputModule.js
create mode 100644 web/lib/wfl/inputPort.js
create mode 100644 web/lib/wfl/outputPort.js
create mode 100644 web/lib/wfl/port.js
create mode 100644 web/lib/wfl/staticWorkflows.js
create mode 100644 web/lib/wfl/workflow.js
create mode 100644 web/lib/wfl/workflowLayerSource.js
create mode 100644 web/lib/wfl/workflowModule.js
create mode 100644 web/lib/wfl/workflowStyle.js
create mode 100644 web/lib/wfl/workflowUtils.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list