[Opengeoscience-developers] OpenGeoscience branch, next, updated. 2ffc539d544127a44fc6e39878dd2258984c5236

[Ben Burnett]

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  2ffc539d544127a44fc6e39878dd2258984c5236 (commit)
       via  904f2c418fa81a82708922bfbc1c788cbf8ec0ad (commit)
       via  3a08c1ab4f17022681b87933e59d4c9618e8e5e3 (commit)
       via  640e92b2236f660c971e27f5779aaca29672cbc2 (commit)
       via  b3a540f3aa1b600a8bfd2b13e97dbceabf4b29f9 (commit)
       via  0fd3508c980aa67072daf69838827e2db0c7065d (commit)
       via  d09c57d4aa400a7a31c54817452c34023ed2d096 (commit)
      from  507c0c3eed9420476d732febb5824dac12c00221 (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=2ffc539d544127a44fc6e39878dd2258984c5236
commit 2ffc539d544127a44fc6e39878dd2258984c5236
Merge: 507c0c3 904f2c4
Author: Ben Burnett <bburnett at poly.edu>
Date:   Tue Apr 16 16:54:30 2013 -0400

    Merge branch 'service_modules' into next
    
    Conflicts:
    	.gitignore
    	CMakeLists.txt
    	geoweb.py
    	server.conf.in

 .gitignore                      |    9 +-
 CMakeLists.txt                  |   13 +-
 geoweb                          |    1 +
 geoweb.py                       |   18 +--
 geowebsocket.py                 |  120 +++++++++++++++
 modules/__init__.py             |    1 +
 modules/websocket_chat.py       |    3 +
 server.conf.in                  |    8 +-
 services/__init__.py            |   54 +++++++
 services/cdms.py                |   29 ++++
 services/echo.py                |   17 ++
 services/ls.py                  |   19 +++
 services/streaming.py           |   54 +++++++
 services/streaming/client.py    |   38 +++++
 services/streaming/master.py    |  307 +++++++++++++++++++++++++++++++++++++++
 services/streaming/worker.py    |  150 +++++++++++++++++++
 temp/README                     |    1 +
 web/apps/streaming/index.html   |   14 ++
 web/apps/streaming/streaming.js |  175 ++++++++++++++++++++++
 19 files changed, 1005 insertions(+), 26 deletions(-)

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

Summary of changes:
 .gitignore                      |    9 +-
 CMakeLists.txt                  |   13 +-
 geoweb                          |    1 +
 geoweb.py                       |   18 +--
 geowebsocket.py                 |  120 +++++++++++++++
 modules/__init__.py             |    1 +
 modules/websocket_chat.py       |    3 +
 server.conf.in                  |    8 +-
 services/__init__.py            |   54 +++++++
 services/cdms.py                |   29 ++++
 services/echo.py                |   17 ++
 services/ls.py                  |   19 +++
 services/streaming.py           |   54 +++++++
 services/streaming/client.py    |   38 +++++
 services/streaming/master.py    |  307 +++++++++++++++++++++++++++++++++++++++
 services/streaming/worker.py    |  150 +++++++++++++++++++
 temp/README                     |    1 +
 web/apps/streaming/index.html   |   14 ++
 web/apps/streaming/streaming.js |  175 ++++++++++++++++++++++
 19 files changed, 1005 insertions(+), 26 deletions(-)
 create mode 100644 geowebsocket.py
 create mode 100644 modules/__init__.py
 create mode 100644 services/__init__.py
 create mode 100644 services/cdms.py
 create mode 100644 services/echo.py
 create mode 100644 services/ls.py
 create mode 100644 services/streaming.py
 create mode 100644 services/streaming/client.py
 create mode 100644 services/streaming/master.py
 create mode 100644 services/streaming/worker.py
 create mode 100644 temp/README
 create mode 100644 web/apps/streaming/index.html
 create mode 100644 web/apps/streaming/streaming.js


hooks/post-receive
-- 
OpenGeoscience