[Opengeoscience-developers] OpenGeoscience branch, next, updated. 5cd961d7c08d6d4b025a2e1957ce9b413e567078
Aashish Chaudhary
aashish.chaudhary at kitware.com
Wed Sep 11 10:00:29 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 5cd961d7c08d6d4b025a2e1957ce9b413e567078 (commit)
via dd6f1e1f620a3b3e5fe979b04b309aa9ec03b535 (commit)
via a123247cd85a8bd2ff56c3e4a7eecb87c5804197 (commit)
via a509164755b16678cb0a634b6a2fc951b282854e (commit)
via 896a333e2b75fec782a1b53d376a470f685694ac (commit)
via 64b84ce43fc17eb5f433cd28d8f0ee2c69ae4a6e (commit)
via 6f24123623d3f823a6b53df67da037e4ce6bff68 (commit)
via aaa85fabd6c717b33a7b637278f05cb9846eade2 (commit)
via 91d84472071bc60fcefa27e7cd799bde4d2c3d1d (commit)
from 40dbc5d1703b66751c23371dfa430173bfcc1131 (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=5cd961d7c08d6d4b025a2e1957ce9b413e567078
commit 5cd961d7c08d6d4b025a2e1957ce9b413e567078
Merge: 40dbc5d dd6f1e1
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Wed Sep 11 10:00:23 2013 -0400
Merge remote-tracking branch 'origin/cleanup_and_rename' into next
* origin/cleanup_and_rename:
Got rid of init()
Relocated trip whitespace script
Added run script
Configure runtime script
Fixed merged related bug
Changed geoweb -> geojs
Fixed CMake and updated the name of the library
.gitignore | 2 +-
.project | 2 +-
CMakeLists.txt | 223 +++++++++++++-------
cmake/FindVisTrails.cmake | 12 +
.../configure_server.cmake.in | 8 +-
cmake/dashboards/dashboard.cmake | 2 +-
geocelery_conf.py.in => cmake/geocelery_conf.py.in | 0
cmake/run.sh.in | 10 +
server.conf.in => cmake/server.conf.in | 6 +-
scripts/setup_path.sh => cmake/setup-runtime.sh.in | 4 +-
geoweb => geojs | 18 +-
geoweb.min.js.in => geojs.min.js.in | 2 +-
geoweb.py => geojs.py | 5 +-
geojs_dev.in | 3 +
geoweb_dev.in | 3 -
modules/esgf/__init__.py | 4 +-
modules/esgf/query.py | 2 +-
modules/geodata.py | 4 +-
modules/mongo.py | 4 +-
modules/ogsvtk.py | 10 +-
modules/reader.py | 4 +-
scripts/setup-for-development.sh | 2 +-
.../trim_trailing_whitespace.sh | 0
services/testworkflow.json | 2 +-
services/vistrail.py | 2 +-
web/apps/archive/archive.js | 4 +-
web/apps/archive/index.html | 30 +---
web/apps/streaming/index.html | 2 +-
web/common/css/{geoweb.css => geojs.css} | 0
web/lib/geo/featureLayer.js | 3 -
web/lib/geo/layer.js | 8 -
web/lib/srv/webSocket.js | 2 +-
web/lib/vgl/testing/drawMap.html | 2 +-
web/lib/vgl/testing/drawSphere.html | 2 +-
web/lib/vgl/testing/drawTest1.html | 2 +-
web/lib/wfl/registry.js | 34 ++--
web/lib/wfl/staticWorkflows.js | 46 ++--
37 files changed, 261 insertions(+), 208 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
.project | 2 +-
CMakeLists.txt | 223 +++++++++++++-------
cmake/FindVisTrails.cmake | 12 +
.../configure_server.cmake.in | 8 +-
cmake/dashboards/dashboard.cmake | 2 +-
geocelery_conf.py.in => cmake/geocelery_conf.py.in | 0
cmake/run.sh.in | 10 +
server.conf.in => cmake/server.conf.in | 6 +-
scripts/setup_path.sh => cmake/setup-runtime.sh.in | 4 +-
geoweb => geojs | 18 +-
geoweb.min.js.in => geojs.min.js.in | 2 +-
geoweb.py => geojs.py | 5 +-
geojs_dev.in | 3 +
geoweb_dev.in | 3 -
modules/esgf/__init__.py | 4 +-
modules/esgf/query.py | 2 +-
modules/geodata.py | 4 +-
modules/mongo.py | 4 +-
modules/ogsvtk.py | 10 +-
modules/reader.py | 4 +-
scripts/setup-for-development.sh | 2 +-
.../trim_trailing_whitespace.sh | 0
services/testworkflow.json | 2 +-
services/vistrail.py | 2 +-
web/apps/archive/archive.js | 4 +-
web/apps/archive/index.html | 30 +---
web/apps/streaming/index.html | 2 +-
web/common/css/{geoweb.css => geojs.css} | 0
web/lib/geo/featureLayer.js | 3 -
web/lib/geo/layer.js | 8 -
web/lib/srv/webSocket.js | 2 +-
web/lib/vgl/testing/drawMap.html | 2 +-
web/lib/vgl/testing/drawSphere.html | 2 +-
web/lib/vgl/testing/drawTest1.html | 2 +-
web/lib/wfl/registry.js | 34 ++--
web/lib/wfl/staticWorkflows.js | 46 ++--
37 files changed, 261 insertions(+), 208 deletions(-)
create mode 100644 cmake/FindVisTrails.cmake
rename configure_server.cmake.in => cmake/configure_server.cmake.in (65%)
rename geocelery_conf.py.in => cmake/geocelery_conf.py.in (100%)
create mode 100755 cmake/run.sh.in
rename server.conf.in => cmake/server.conf.in (80%)
rename scripts/setup_path.sh => cmake/setup-runtime.sh.in (51%)
rename geoweb => geojs (92%)
rename geoweb.min.js.in => geojs.min.js.in (88%)
rename geoweb.py => geojs.py (99%)
create mode 100755 geojs_dev.in
delete mode 100755 geoweb_dev.in
rename trim_trailing_whitespace.sh => scripts/trim_trailing_whitespace.sh (100%)
rename web/common/css/{geoweb.css => geojs.css} (100%)
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list