[Opengeoscience-developers] OpenGeoscience branch, master, updated. afa8c53b188494566785a5070e7690fc4544c821

Aashish Chaudhary aashish.chaudhary at kitware.com
Fri May 3 20:08:34 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, master has been updated
       via  afa8c53b188494566785a5070e7690fc4544c821 (commit)
       via  5b0c250e44258cd62ff3b8f05ef1b9a6f7d6d655 (commit)
       via  be8a8a2c5942cd42a50cd41834472fe21e5e3456 (commit)
       via  d8355cb5b7a84026d7fbe1db121b700d1ed638d8 (commit)
       via  27704500eeb7b214b200e48d3217e6ba2d67596b (commit)
       via  4fd8658841dc7d52f11b55cc7f8ff5648c6835f5 (commit)
       via  303caca17e38e50601c8b93b9e4baba7251d1fa5 (commit)
       via  267cde06f21f9af0b99762c5d1b9616cf527d284 (commit)
       via  12f54d400e1da221654891eb18e30d2999aa0134 (commit)
       via  94a8ed6c8c74d72b836e3e8acf8715200d25a13f (commit)
       via  65e7638c84384fd1e965058de03afe7f14109d25 (commit)
       via  ae15989a51353c066c3764882c36ea6276405a80 (commit)
       via  ad2013402b0f8a47dd2e9c453dfbacfae72062ca (commit)
       via  665da8b6da1bf062485d19bd12caaf5adda29a69 (commit)
       via  c44ebbc70f0a726382d3e6dab3d4c47d852f33bb (commit)
      from  f4c8fa87aa1e7b19bff96f7470f8a0c9cfbd1fd2 (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=afa8c53b188494566785a5070e7690fc4544c821
commit afa8c53b188494566785a5070e7690fc4544c821
Merge: f4c8fa8 5b0c250
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Fri May 3 19:56:58 2013 -0400

    Merge remote-tracking branch 'origin/services_modules_nodes'
    
    * origin/services_modules_nodes:
      remove log statement
      Cleanup, add service test outside service dir
      Call service from any directory stemming from webroot
      Clean up debug statements, better pid file handling
      Fix name issue with nodes
      Remove old file
      Reworked server structure working
      Add webSocket.js to uglify list
      Renamed websocket.js to webSocket.js
      Finishing up structure and cleaning
      Added js library for websockets, cleaned up server side structure
      WIP Cleaning up and organization

 CMakeLists.txt                                     |   23 ++-
 geoweb.py                                          |   84 +++++--
 geowebsocket.py                                    |  120 ---------
 modules/geowebsocket.py                            |  225 +++++++++++++++++
 modules/logging.py                                 |   13 +
 modules/websocket_chat.py                          |  125 ----------
 modules/websocket_pi.py                            |  146 -----------
 nodes/__init__.py                                  |  145 +++++++++++
 nodes/echo.py                                      |   14 +
 .../streaming/master.py => nodes/streammaster.py   |  255 ++++++++------------
 .../streaming/worker.py => nodes/streamworker.py   |   86 ++-----
 server.conf.in                                     |    3 +-
 services/__init__.py                               |   54 ----
 services/streaming.py                              |   54 ----
 services/streaming/client.py                       |   38 ---
 temp/testService.py                                |    2 +
 web/apps/streaming/index.html                      |    2 +
 web/apps/streaming/streaming.js                    |  161 +++++--------
 web/lib/srv/init.js                                |    6 +
 web/lib/srv/webSocket.js                           |  253 +++++++++++++++++++
 20 files changed, 930 insertions(+), 879 deletions(-)

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

Summary of changes:
 CMakeLists.txt                                     |   23 ++-
 geoweb.py                                          |   84 +++++--
 geowebsocket.py                                    |  120 ---------
 modules/geowebsocket.py                            |  225 +++++++++++++++++
 modules/logging.py                                 |   13 +
 modules/websocket_chat.py                          |  125 ----------
 modules/websocket_pi.py                            |  146 -----------
 nodes/__init__.py                                  |  145 +++++++++++
 nodes/echo.py                                      |   14 +
 .../streaming/master.py => nodes/streammaster.py   |  255 ++++++++------------
 .../streaming/worker.py => nodes/streamworker.py   |   86 ++-----
 server.conf.in                                     |    3 +-
 services/__init__.py                               |   54 ----
 services/streaming.py                              |   54 ----
 services/streaming/client.py                       |   38 ---
 temp/testService.py                                |    2 +
 web/apps/streaming/index.html                      |    2 +
 web/apps/streaming/streaming.js                    |  161 +++++--------
 web/lib/srv/init.js                                |    6 +
 web/lib/srv/webSocket.js                           |  253 +++++++++++++++++++
 20 files changed, 930 insertions(+), 879 deletions(-)
 delete mode 100644 geowebsocket.py
 create mode 100644 modules/geowebsocket.py
 create mode 100644 modules/logging.py
 delete mode 100755 modules/websocket_chat.py
 delete mode 100755 modules/websocket_pi.py
 create mode 100644 nodes/__init__.py
 create mode 100644 nodes/echo.py
 rename services/streaming/master.py => nodes/streammaster.py (55%)
 rename services/streaming/worker.py => nodes/streamworker.py (54%)
 delete mode 100644 services/__init__.py
 delete mode 100644 services/streaming.py
 delete mode 100644 services/streaming/client.py
 create mode 100644 temp/testService.py
 create mode 100644 web/lib/srv/init.js
 create mode 100644 web/lib/srv/webSocket.js


hooks/post-receive
-- 
OpenGeoscience



More information about the Opengeoscience-developers mailing list