[Opengeoscience-developers] OpenGeoscience branch, next, updated. 5ce521b1b174c2cde916fc939ad4e495aa4f5b10

[Aashish Chaudhary]

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  5ce521b1b174c2cde916fc939ad4e495aa4f5b10 (commit)
       via  3a58e910a8605adcc89a5ea1a801c59c78a5b607 (commit)
       via  45fcb93db6213fa3457bb77103ec765b5d354d1e (commit)
       via  9812ca010bb75d4a83c9d735ea0b0bce1f17b9e1 (commit)
      from  5cd961d7c08d6d4b025a2e1957ce9b413e567078 (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=5ce521b1b174c2cde916fc939ad4e495aa4f5b10
commit 5ce521b1b174c2cde916fc939ad4e495aa4f5b10
Merge: 5cd961d 3a58e91
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Wed Sep 11 11:40:19 2013 -0400

    Merge remote-tracking branch 'origin/cleanup_and_rename' into next
    
    * origin/cleanup_and_rename:
      Reverting geojs -> geoweb
      Revert "Changed geoweb -> geojs"
      Move CMake files into cmake/

 .gitignore                                |    2 +-
 .project                                  |    2 +-
 CMakeLists.txt                            |   36 +++++++++++-----------
 cmake/configure_server.cmake.in           |    6 ++--
 cmake/dashboards/dashboard.cmake          |    2 +-
 geojs.min.js.in => cmake/geoweb.min.js.in |    2 +-
 cmake/geoweb_dev.in                       |    3 ++
 cmake/run.sh.in                           |    2 +-
 cmake/server.conf.in                      |    6 ++--
 geojs_dev.in                              |    3 --
 geojs => geoweb                           |   18 +++++-----
 geojs.py => geoweb.py                     |    5 ++-
 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 +-
 services/testworkflow.json                |    2 +-
 services/vistrail.py                      |    2 +-
 web/apps/archive/index.html               |    4 +-
 web/apps/streaming/index.html             |    2 +-
 web/common/css/{geojs.css => geoweb.css}  |    0
 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 ++++++++++++++--------------
 30 files changed, 109 insertions(+), 106 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                |    2 +-
 .project                                  |    2 +-
 CMakeLists.txt                            |   36 +++++++++++-----------
 cmake/configure_server.cmake.in           |    6 ++--
 cmake/dashboards/dashboard.cmake          |    2 +-
 geojs.min.js.in => cmake/geoweb.min.js.in |    2 +-
 cmake/geoweb_dev.in                       |    3 ++
 cmake/run.sh.in                           |    2 +-
 cmake/server.conf.in                      |    6 ++--
 geojs_dev.in                              |    3 --
 geojs => geoweb                           |   18 +++++-----
 geojs.py => geoweb.py                     |    5 ++-
 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 +-
 services/testworkflow.json                |    2 +-
 services/vistrail.py                      |    2 +-
 web/apps/archive/index.html               |    4 +-
 web/apps/streaming/index.html             |    2 +-
 web/common/css/{geojs.css => geoweb.css}  |    0
 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 ++++++++++++++--------------
 30 files changed, 109 insertions(+), 106 deletions(-)
 rename geojs.min.js.in => cmake/geoweb.min.js.in (88%)
 create mode 100755 cmake/geoweb_dev.in
 delete mode 100755 geojs_dev.in
 rename geojs => geoweb (92%)
 rename geojs.py => geoweb.py (99%)
 rename web/common/css/{geojs.css => geoweb.css} (100%)


hooks/post-receive
-- 
OpenGeoscience