[Opengeoscience-developers] OpenGeoscience branch, master, updated. master-no-submodule-5-g09e80ff
Aashish Chaudhary
aashish.chaudhary at kitware.com
Wed Sep 25 20:53:17 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 09e80ffb66a12b32c3df29833daf88e28ba3f758 (commit)
via 66c405c490943cfce0a0cf530b7312cba9bf8477 (commit)
via c393fbb99626eaac88bae0f53bcf8e3f1e7f7f5d (commit)
via 44c73c8daa6c5412cd332f9f4951c69ec04174bd (commit)
via 96960a89c851a2ea9e93991131e8efd05b89ae04 (commit)
from 0d35103c3d16d3a74f84a25743b37ca299015ccc (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=09e80ffb66a12b32c3df29833daf88e28ba3f758
commit 09e80ffb66a12b32c3df29833daf88e28ba3f758
Merge: 0d35103 66c405c
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Wed Sep 25 20:51:33 2013 -0400
Merge remote-tracking branch 'origin/split_geojs_vgl'
* origin/split_geojs_vgl:
Updated geojs to its current master
Updated apps
Updated geojs ref
Updated geoweb to use vgl and geojs library
Conflicts:
CMakeLists.txt
web/lib/geo/map.js
web/lib/ui/gis.js
web/lib/wfl/editor.js
web/lib/wfl/inputModule.js
web/lib/wfl/module.js
web/lib/wfl/port.js
web/lib/wfl/style.js
web/lib/wfl/workflow.js
.gitmodules | 3 +
CMakeLists.txt | 182 +-
web/apps/archive/index.html | 3 +-
web/lib/CMakeLists.txt | 2 +-
web/lib/geo/archiveLayerSource.js | 256 -
web/lib/geo/command.js | 52 -
web/lib/geo/data.js |31265 -------------------------------
web/lib/geo/ellipsoid.js | 224 -
web/lib/geo/feature.js | 298 -
web/lib/geo/featureCollection.js | 122 -
web/lib/geo/featureLayer.js | 509 -
web/lib/geo/geoTransform.js | 231 -
web/lib/geo/init.js | 14 -
web/lib/geo/latlng.js | 51 -
web/lib/geo/layer.js | 546 -
web/lib/geo/layerSource.js | 90 -
web/lib/geo/map.js | 989 -
web/lib/geo/mapInteractorStyle.js | 247 -
web/lib/geo/mercator.js | 254 -
web/lib/geo/openStreetMapLayer.js | 370 -
web/lib/geo/prepareForRenderRequest.js | 63 -
web/lib/geo/time.js | 29 -
web/lib/geo/updateRequest.js | 73 -
web/lib/geojs | 1 +
web/lib/srv/init.js | 12 -
web/lib/srv/webSocket.js | 268 -
web/lib/ui/gis.js | 871 -
web/lib/ui/init.js | 7 -
web/lib/vgl/CMakeLists.txt | 3 -
web/lib/vgl/actor.js | 298 -
web/lib/vgl/blend.js | 110 -
web/lib/vgl/boundingObject.js | 122 -
web/lib/vgl/camera.js | 409 -
web/lib/vgl/command.js | 61 -
web/lib/vgl/data.js | 32 -
web/lib/vgl/defaultValue.js | 30 -
web/lib/vgl/freezeObject.js | 37 -
web/lib/vgl/geojsonReader.js | 616 -
web/lib/vgl/geomData.js | 1144 --
web/lib/vgl/groupMapper.js | 167 -
web/lib/vgl/groupNode.js | 253 -
web/lib/vgl/init.js | 81 -
web/lib/vgl/interactorStyle.js | 127 -
web/lib/vgl/legend.js | 53 -
web/lib/vgl/lineSource.js | 130 -
web/lib/vgl/mapper.js | 238 -
web/lib/vgl/material.js | 263 -
web/lib/vgl/materialAttribute.js | 141 -
web/lib/vgl/modelViewMatrixStack.js | 49 -
web/lib/vgl/node.js | 194 -
web/lib/vgl/object.js | 52 -
web/lib/vgl/picker.js | 143 -
web/lib/vgl/planeSource.js | 181 -
web/lib/vgl/pointSource.js | 144 -
web/lib/vgl/renderWindow.js | 291 -
web/lib/vgl/renderer.js | 497 -
web/lib/vgl/shader.js | 119 -
web/lib/vgl/shaderProgram.js | 362 -
web/lib/vgl/source.js | 39 -
web/lib/vgl/testing/CMakeLists.txt | 25 -
web/lib/vgl/testing/drawMap.html | 44 -
web/lib/vgl/testing/drawSphere.html | 102 -
web/lib/vgl/testing/drawTest1.html | 85 -
web/lib/vgl/texture.js | 547 -
web/lib/vgl/timestamp.js | 51 -
web/lib/vgl/trackballInteractorStyle.js | 214 -
web/lib/vgl/uniform.js | 304 -
web/lib/vgl/utils.js | 1092 --
web/lib/vgl/vertexAttribute.js | 100 -
web/lib/vgl/viewer.js | 245 -
web/lib/vgl/visitor.js | 181 -
web/lib/wfl/connection.js | 145 -
web/lib/wfl/editor.js | 470 -
web/lib/wfl/init.js | 7 -
web/lib/wfl/inputModule.js | 229 -
web/lib/wfl/inputPort.js | 103 -
web/lib/wfl/layerSource.js | 122 -
web/lib/wfl/module.js | 413 -
web/lib/wfl/outputPort.js | 60 -
web/lib/wfl/port.js | 150 -
web/lib/wfl/registry.js | 2662 ---
web/lib/wfl/staticWorkflows.js | 402 -
web/lib/wfl/style.js | 68 -
web/lib/wfl/utils.js | 100 -
web/lib/wfl/workflow.js | 392 -
85 files changed, 26 insertions(+), 51705 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
.gitmodules | 3 +
CMakeLists.txt | 182 +-
web/apps/archive/index.html | 3 +-
web/lib/CMakeLists.txt | 2 +-
web/lib/geo/archiveLayerSource.js | 256 -
web/lib/geo/command.js | 52 -
web/lib/geo/data.js |31265 -------------------------------
web/lib/geo/ellipsoid.js | 224 -
web/lib/geo/feature.js | 298 -
web/lib/geo/featureCollection.js | 122 -
web/lib/geo/featureLayer.js | 509 -
web/lib/geo/geoTransform.js | 231 -
web/lib/geo/init.js | 14 -
web/lib/geo/latlng.js | 51 -
web/lib/geo/layer.js | 546 -
web/lib/geo/layerSource.js | 90 -
web/lib/geo/map.js | 989 -
web/lib/geo/mapInteractorStyle.js | 247 -
web/lib/geo/mercator.js | 254 -
web/lib/geo/openStreetMapLayer.js | 370 -
web/lib/geo/prepareForRenderRequest.js | 63 -
web/lib/geo/time.js | 29 -
web/lib/geo/updateRequest.js | 73 -
web/lib/geojs | 1 +
web/lib/srv/init.js | 12 -
web/lib/srv/webSocket.js | 268 -
web/lib/ui/gis.js | 871 -
web/lib/ui/init.js | 7 -
web/lib/vgl/CMakeLists.txt | 3 -
web/lib/vgl/actor.js | 298 -
web/lib/vgl/blend.js | 110 -
web/lib/vgl/boundingObject.js | 122 -
web/lib/vgl/camera.js | 409 -
web/lib/vgl/command.js | 61 -
web/lib/vgl/data.js | 32 -
web/lib/vgl/defaultValue.js | 30 -
web/lib/vgl/freezeObject.js | 37 -
web/lib/vgl/geojsonReader.js | 616 -
web/lib/vgl/geomData.js | 1144 --
web/lib/vgl/groupMapper.js | 167 -
web/lib/vgl/groupNode.js | 253 -
web/lib/vgl/init.js | 81 -
web/lib/vgl/interactorStyle.js | 127 -
web/lib/vgl/legend.js | 53 -
web/lib/vgl/lineSource.js | 130 -
web/lib/vgl/mapper.js | 238 -
web/lib/vgl/material.js | 263 -
web/lib/vgl/materialAttribute.js | 141 -
web/lib/vgl/modelViewMatrixStack.js | 49 -
web/lib/vgl/node.js | 194 -
web/lib/vgl/object.js | 52 -
web/lib/vgl/picker.js | 143 -
web/lib/vgl/planeSource.js | 181 -
web/lib/vgl/pointSource.js | 144 -
web/lib/vgl/renderWindow.js | 291 -
web/lib/vgl/renderer.js | 497 -
web/lib/vgl/shader.js | 119 -
web/lib/vgl/shaderProgram.js | 362 -
web/lib/vgl/source.js | 39 -
web/lib/vgl/testing/CMakeLists.txt | 25 -
web/lib/vgl/testing/drawMap.html | 44 -
web/lib/vgl/testing/drawSphere.html | 102 -
web/lib/vgl/testing/drawTest1.html | 85 -
web/lib/vgl/texture.js | 547 -
web/lib/vgl/timestamp.js | 51 -
web/lib/vgl/trackballInteractorStyle.js | 214 -
web/lib/vgl/uniform.js | 304 -
web/lib/vgl/utils.js | 1092 --
web/lib/vgl/vertexAttribute.js | 100 -
web/lib/vgl/viewer.js | 245 -
web/lib/vgl/visitor.js | 181 -
web/lib/wfl/connection.js | 145 -
web/lib/wfl/editor.js | 470 -
web/lib/wfl/init.js | 7 -
web/lib/wfl/inputModule.js | 229 -
web/lib/wfl/inputPort.js | 103 -
web/lib/wfl/layerSource.js | 122 -
web/lib/wfl/module.js | 413 -
web/lib/wfl/outputPort.js | 60 -
web/lib/wfl/port.js | 150 -
web/lib/wfl/registry.js | 2662 ---
web/lib/wfl/staticWorkflows.js | 402 -
web/lib/wfl/style.js | 68 -
web/lib/wfl/utils.js | 100 -
web/lib/wfl/workflow.js | 392 -
85 files changed, 26 insertions(+), 51705 deletions(-)
create mode 100644 .gitmodules
delete mode 100644 web/lib/geo/archiveLayerSource.js
delete mode 100644 web/lib/geo/command.js
delete mode 100644 web/lib/geo/data.js
delete mode 100644 web/lib/geo/ellipsoid.js
delete mode 100644 web/lib/geo/feature.js
delete mode 100644 web/lib/geo/featureCollection.js
delete mode 100644 web/lib/geo/featureLayer.js
delete mode 100644 web/lib/geo/geoTransform.js
delete mode 100644 web/lib/geo/init.js
delete mode 100644 web/lib/geo/latlng.js
delete mode 100644 web/lib/geo/layer.js
delete mode 100644 web/lib/geo/layerSource.js
delete mode 100644 web/lib/geo/map.js
delete mode 100644 web/lib/geo/mapInteractorStyle.js
delete mode 100644 web/lib/geo/mercator.js
delete mode 100644 web/lib/geo/openStreetMapLayer.js
delete mode 100644 web/lib/geo/prepareForRenderRequest.js
delete mode 100644 web/lib/geo/time.js
delete mode 100644 web/lib/geo/updateRequest.js
create mode 160000 web/lib/geojs
delete mode 100644 web/lib/srv/init.js
delete mode 100644 web/lib/srv/webSocket.js
delete mode 100644 web/lib/ui/gis.js
delete mode 100644 web/lib/ui/init.js
delete mode 100644 web/lib/vgl/CMakeLists.txt
delete mode 100644 web/lib/vgl/actor.js
delete mode 100644 web/lib/vgl/blend.js
delete mode 100644 web/lib/vgl/boundingObject.js
delete mode 100644 web/lib/vgl/camera.js
delete mode 100644 web/lib/vgl/command.js
delete mode 100644 web/lib/vgl/data.js
delete mode 100644 web/lib/vgl/defaultValue.js
delete mode 100644 web/lib/vgl/freezeObject.js
delete mode 100644 web/lib/vgl/geojsonReader.js
delete mode 100644 web/lib/vgl/geomData.js
delete mode 100644 web/lib/vgl/groupMapper.js
delete mode 100644 web/lib/vgl/groupNode.js
delete mode 100644 web/lib/vgl/init.js
delete mode 100644 web/lib/vgl/interactorStyle.js
delete mode 100644 web/lib/vgl/legend.js
delete mode 100644 web/lib/vgl/lineSource.js
delete mode 100644 web/lib/vgl/mapper.js
delete mode 100644 web/lib/vgl/material.js
delete mode 100644 web/lib/vgl/materialAttribute.js
delete mode 100644 web/lib/vgl/modelViewMatrixStack.js
delete mode 100644 web/lib/vgl/node.js
delete mode 100644 web/lib/vgl/object.js
delete mode 100644 web/lib/vgl/picker.js
delete mode 100644 web/lib/vgl/planeSource.js
delete mode 100644 web/lib/vgl/pointSource.js
delete mode 100644 web/lib/vgl/renderWindow.js
delete mode 100644 web/lib/vgl/renderer.js
delete mode 100644 web/lib/vgl/shader.js
delete mode 100644 web/lib/vgl/shaderProgram.js
delete mode 100644 web/lib/vgl/source.js
delete mode 100644 web/lib/vgl/testing/CMakeLists.txt
delete mode 100644 web/lib/vgl/testing/drawMap.html
delete mode 100644 web/lib/vgl/testing/drawSphere.html
delete mode 100644 web/lib/vgl/testing/drawTest1.html
delete mode 100644 web/lib/vgl/texture.js
delete mode 100644 web/lib/vgl/timestamp.js
delete mode 100644 web/lib/vgl/trackballInteractorStyle.js
delete mode 100644 web/lib/vgl/uniform.js
delete mode 100644 web/lib/vgl/utils.js
delete mode 100644 web/lib/vgl/vertexAttribute.js
delete mode 100644 web/lib/vgl/viewer.js
delete mode 100644 web/lib/vgl/visitor.js
delete mode 100644 web/lib/wfl/connection.js
delete mode 100644 web/lib/wfl/editor.js
delete mode 100644 web/lib/wfl/init.js
delete mode 100644 web/lib/wfl/inputModule.js
delete mode 100644 web/lib/wfl/inputPort.js
delete mode 100644 web/lib/wfl/layerSource.js
delete mode 100644 web/lib/wfl/module.js
delete mode 100644 web/lib/wfl/outputPort.js
delete mode 100644 web/lib/wfl/port.js
delete mode 100644 web/lib/wfl/registry.js
delete mode 100644 web/lib/wfl/staticWorkflows.js
delete mode 100644 web/lib/wfl/style.js
delete mode 100644 web/lib/wfl/utils.js
delete mode 100644 web/lib/wfl/workflow.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list