[Opengeoscience-developers] OpenGeoscience branch, master, updated. 7c09a7f72a3cd7f959791453fc1452205f9be47c

[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, master has been updated
       via  7c09a7f72a3cd7f959791453fc1452205f9be47c (commit)
       via  5b923b15d054febad6f7aa192dcf83c8a56a40ed (commit)
       via  d027d1f2844d1dc78f98ee367d78833368f1bca8 (commit)
       via  6e0754b0989640a1f2977cbcab3c0278df55662d (commit)
       via  3a58e910a8605adcc89a5ea1a801c59c78a5b607 (commit)
       via  45fcb93db6213fa3457bb77103ec765b5d354d1e (commit)
       via  9812ca010bb75d4a83c9d735ea0b0bce1f17b9e1 (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)
       via  8da741f2d3007404b93b04239324900d2f5ceae2 (commit)
      from  b35937c996dd89110d60a5ff2c5627202741b1c5 (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=7c09a7f72a3cd7f959791453fc1452205f9be47c
commit 7c09a7f72a3cd7f959791453fc1452205f9be47c
Merge: b35937c 5b923b1
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Wed Sep 11 16:11:53 2013 -0400

    Merge remote-tracking branch 'origin/cleanup_and_rename'
    
    * origin/cleanup_and_rename:
      Fix configuration issues with server.conf
      Added missing file
      Using build time configure
      Reverting geojs -> geoweb
      Revert "Changed geoweb -> geojs"
      Move CMake files into cmake/
      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
      map info with jqueryui plus fixes, once again

 CMakeLists.txt                                     |  236 +++++++++++++-------
 cmake/FindVisTrails.cmake                          |   12 +
 cmake/configure.cmake                              |   29 +++
 .../configure_server.cmake.in                      |    7 +-
 geocelery_conf.py.in => cmake/geocelery_conf.py.in |    0
 geoweb.min.js.in => cmake/geoweb.min.js.in         |    0
 geoweb_dev.in => cmake/geoweb_dev.in               |    0
 cmake/run.sh.in                                    |   10 +
 server.conf.in => cmake/server.conf.in             |    2 +-
 scripts/setup_path.sh => cmake/setup-runtime.sh.in |    4 +-
 .../trim_trailing_whitespace.sh                    |    0
 web/apps/archive/archive.js                        |   34 ++-
 web/apps/archive/index.html                        |   30 +--
 web/lib/geo/featureLayer.js                        |   12 +-
 web/lib/geo/layer.js                               |    8 -
 web/lib/geo/map.js                                 |   12 +-
 web/lib/geo/openStreetMapLayer.js                  |    4 +-
 17 files changed, 252 insertions(+), 148 deletions(-)

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

Summary of changes:
 CMakeLists.txt                                     |  236 +++++++++++++-------
 cmake/FindVisTrails.cmake                          |   12 +
 cmake/configure.cmake                              |   29 +++
 .../configure_server.cmake.in                      |    7 +-
 geocelery_conf.py.in => cmake/geocelery_conf.py.in |    0
 geoweb.min.js.in => cmake/geoweb.min.js.in         |    0
 geoweb_dev.in => cmake/geoweb_dev.in               |    0
 cmake/run.sh.in                                    |   10 +
 server.conf.in => cmake/server.conf.in             |    2 +-
 scripts/setup_path.sh => cmake/setup-runtime.sh.in |    4 +-
 .../trim_trailing_whitespace.sh                    |    0
 web/apps/archive/archive.js                        |   34 ++-
 web/apps/archive/index.html                        |   30 +--
 web/lib/geo/featureLayer.js                        |   12 +-
 web/lib/geo/layer.js                               |    8 -
 web/lib/geo/map.js                                 |   12 +-
 web/lib/geo/openStreetMapLayer.js                  |    4 +-
 17 files changed, 252 insertions(+), 148 deletions(-)
 create mode 100644 cmake/FindVisTrails.cmake
 create mode 100644 cmake/configure.cmake
 rename configure_server.cmake.in => cmake/configure_server.cmake.in (60%)
 rename geocelery_conf.py.in => cmake/geocelery_conf.py.in (100%)
 rename geoweb.min.js.in => cmake/geoweb.min.js.in (100%)
 rename geoweb_dev.in => cmake/geoweb_dev.in (100%)
 create mode 100755 cmake/run.sh.in
 rename server.conf.in => cmake/server.conf.in (92%)
 rename scripts/setup_path.sh => cmake/setup-runtime.sh.in (51%)
 rename trim_trailing_whitespace.sh => scripts/trim_trailing_whitespace.sh (100%)


hooks/post-receive
-- 
OpenGeoscience