[Opengeoscience-developers] OpenGeoscience branch, add_vgl_tests2, updated. b6ca96a758fbd1081665bac61fa4ed6269b2926d
Aashish Chaudhary
aashish.chaudhary at kitware.com
Sat Apr 20 09:53:26 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, add_vgl_tests2 has been updated
via b6ca96a758fbd1081665bac61fa4ed6269b2926d (commit)
via 904f2c418fa81a82708922bfbc1c788cbf8ec0ad (commit)
via 3a08c1ab4f17022681b87933e59d4c9618e8e5e3 (commit)
via 640e92b2236f660c971e27f5779aaca29672cbc2 (commit)
via b3a540f3aa1b600a8bfd2b13e97dbceabf4b29f9 (commit)
via 0fd3508c980aa67072daf69838827e2db0c7065d (commit)
via d09c57d4aa400a7a31c54817452c34023ed2d096 (commit)
from 5f200b99137667c6baa9338c1f16154aac8d086b (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=b6ca96a758fbd1081665bac61fa4ed6269b2926d
commit b6ca96a758fbd1081665bac61fa4ed6269b2926d
Merge: 5f200b9 904f2c4
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Sat Apr 20 09:51:48 2013 -0400
Merge remote-tracking branch 'origin/service_modules' into add_vgl_tests2
* origin/service_modules:
Streaming via service now working, documentation/cleanup to come
Get data dir from config, use temp dir for image
Fixed some streaming bugs WIP, added temp dir
Changed how websockets are routed, streaming service WIP
basic servicing and websockets working
Initial implementation of modules and services and a central websocket server
Conflicts:
CMakeLists.txt
.gitignore | 10 ++
CMakeLists.txt | 13 +-
geoweb | 1 +
geoweb.py | 23 ++--
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, 1012 insertions(+), 25 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 10 ++
CMakeLists.txt | 13 +-
geoweb | 1 +
geoweb.py | 23 ++--
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, 1012 insertions(+), 25 deletions(-)
create mode 100644 .gitignore
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
More information about the Opengeoscience-developers
mailing list