[opencoweb/coweb] b9c363: Removed old javascript files, updated build script...
0 views
Skip to first unread message
GitHub
Nov 1, 2012, 12:08:57 PM11/1/12
to openco...@googlegroups.com
Branch: refs/heads/master
Home: https://github.com/opencoweb/coweb
Commit: b9c363f8df90fc98599428f4d46341097818216c
https://github.com/opencoweb/coweb/commit/b9c363f8df90fc98599428f4d46341097818216c
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-08-31 (Fri, 31 Aug 2012)
Changed paths:
M js/build/build.sh
R js/lib/coweb/ConfigInitializer.js
R js/lib/coweb/collab/UnmanagedHubCollab.js
R js/lib/coweb/ext/CowebWrapper.js
R js/lib/coweb/ext/SimpleLoader.js
R js/lib/coweb/ext/attendance.js
R js/lib/coweb/jsoe/ContextDifference.js
R js/lib/coweb/jsoe/ContextVector.js
R js/lib/coweb/jsoe/ContextVectorTable.js
R js/lib/coweb/jsoe/DeleteOperation.js
R js/lib/coweb/jsoe/HistoryBuffer.js
R js/lib/coweb/jsoe/InsertOperation.js
R js/lib/coweb/jsoe/Operation.js
R js/lib/coweb/jsoe/OperationEngine.js
R js/lib/coweb/jsoe/UpdateOperation.js
R js/lib/coweb/jsoe/factory.js
R js/lib/coweb/listener/UnmanagedHubListener.js
R js/lib/coweb/main.js
R js/lib/coweb/session/BayeuxSession.js
R js/lib/coweb/session/bayeux/CowebExtension.js
R js/lib/coweb/session/bayeux/ListenerBridge.js
R js/lib/coweb/session/bayeux/SessionBridge.js
R js/lib/coweb/session/bayeux/cometd.js
R js/lib/coweb/topics.js
R js/lib/coweb/util/Promise.js
R js/lib/coweb/util/lang.js
R js/lib/coweb/util/xhr.js
M js/setup_js.sh
M js/setup_python_js.sh
M servers/python/coweb/__init__.py
M servers/python/setup.py
Log Message:
-----------
Removed old javascript files, updated build scripts for python
Commit: d084583227a9d3276f980a07811310a1ca0951f1
https://github.com/opencoweb/coweb/commit/d084583227a9d3276f980a07811310a1ca0951f1
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-10 (Mon, 10 Sep 2012)
Changed paths:
A .gitmodules
M README.rst
M docs/Makefile
M docs/conf.py
M docs/java/java.rst
A docs/java/moderator.rst
M docs/protocol/coweb_bayeux.rst
M docs/replace.rst
A docs/tutorial/semantics.rst
M docs/tutorial/tutorial.rst
M servers/java/README.txt
M servers/java/bundle.sh
M servers/java/coweb-admin/admin-archetype/pom.xml
M servers/java/coweb-admin/admin-client/pom.xml
M servers/java/coweb-admin/admin-common/pom.xml
M servers/java/coweb-admin/admin-ejb/pom.xml
M servers/java/coweb-admin/admin-ejb/src/main/resources/META-INF/openejb-jar.xml
M servers/java/coweb-admin/admin-jar/pom.xml
M servers/java/coweb-admin/admin-jar/src/main/java/org/coweb/admin/acls/SessionAcls.java
M servers/java/coweb-admin/pom.xml
M servers/java/coweb-archetype/pom.xml
M servers/java/coweb-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
M servers/java/coweb-archetype/src/main/resources/META-INF/maven/archetype.xml
M servers/java/coweb-bots/pom.xml
M servers/java/coweb-build/pom.xml
M servers/java/coweb-client/pom.xml
M servers/java/coweb-javascript-src/pom.xml
A servers/java/coweb-javascript/README
M servers/java/coweb-javascript/pom.xml
M servers/java/coweb-javascript/src/main/webapp/WEB-INF/web.xml
A servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/ContextDifference.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/ContextVector.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/ContextVectorTable.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/DeleteOperation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/HistoryBuffer.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/InsertOperation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/Operation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/OperationEngine.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/UpdateOperation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/factory.js
M servers/java/coweb-javascript/src/main/webapp/coweb/listener/UnmanagedHubListener.js
M servers/java/coweb-javascript/src/main/webapp/coweb/main.js
M servers/java/coweb-javascript/src/main/webapp/coweb/nls/messages.js
M servers/java/coweb-operationengine/pom.xml
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextDifference.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextVector.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextVectorTable.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/DeleteOperation.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/HistoryBuffer.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/InsertOperation.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/Operation.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/OperationEngine.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/UpdateOperation.java
M servers/java/coweb-server/pom.xml
M servers/java/coweb-server/src/main/java/org/coweb/OperationEngineHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionManager.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionModerator.java
M servers/java/coweb-server/src/main/java/org/coweb/servlet/AdminServlet.java
M servers/java/pom.xml
Log Message:
-----------
Merge master into python
Commit: 389f0e81c52166cde27627ef5ac78a8bf864f921
https://github.com/opencoweb/coweb/commit/389f0e81c52166cde27627ef5ac78a8bf864f921
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-11 (Tue, 11 Sep 2012)
Changed paths:
A servers/python/coweb/pyoe/ContextDifference.py
A servers/python/coweb/pyoe/ContextVector.py
A servers/python/coweb/pyoe/ContextVectorTable.py
A servers/python/coweb/pyoe/DeleteOperation.js
A servers/python/coweb/pyoe/HistoryBuffer.py
A servers/python/coweb/pyoe/InsertOperation.js
A servers/python/coweb/pyoe/OTEngine.js
A servers/python/coweb/pyoe/Operation.js
A servers/python/coweb/pyoe/OperationEngine.py
A servers/python/coweb/pyoe/README
A servers/python/coweb/pyoe/UpdateOperation.js
A servers/python/coweb/pyoe/factory.py
A servers/python/coweb/pyoe/nls/messages.js
Log Message:
-----------
Begin converting jsoe to python
Copied jsoe to a new python directory: pyoe.
Have changed some files to python, still need to check for things like:
Python throws errors when key doesn't exist in dictionary.
Commit: 929fd88f5d1170302534175fbca7ae7a0c1863fc
https://github.com/opencoweb/coweb/commit/929fd88f5d1170302534175fbca7ae7a0c1863fc
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-12 (Wed, 12 Sep 2012)
Changed paths:
M servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
M servers/python/coweb/pyoe/ContextVector.py
R servers/python/coweb/pyoe/DeleteOperation.js
A servers/python/coweb/pyoe/DeleteOperation.py
M servers/python/coweb/pyoe/HistoryBuffer.py
R servers/python/coweb/pyoe/InsertOperation.js
A servers/python/coweb/pyoe/InsertOperation.py
R servers/python/coweb/pyoe/OTEngine.js
R servers/python/coweb/pyoe/Operation.js
A servers/python/coweb/pyoe/Operation.py
R servers/python/coweb/pyoe/UpdateOperation.js
A servers/python/coweb/pyoe/UpdateOperation.py
Log Message:
-----------
All jsoe files have been converted to python and are syntactically correct (though probably not logically correct)
Commit: d21864fad3699ffac6370ded2abc03c3bd81dbc0
https://github.com/opencoweb/coweb/commit/d21864fad3699ffac6370ded2abc03c3bd81dbc0
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-12 (Wed, 12 Sep 2012)
Changed paths:
R servers/python/coweb/pyoe/ContextDifference.py
R servers/python/coweb/pyoe/ContextVector.py
R servers/python/coweb/pyoe/ContextVectorTable.py
R servers/python/coweb/pyoe/DeleteOperation.py
R servers/python/coweb/pyoe/HistoryBuffer.py
R servers/python/coweb/pyoe/InsertOperation.py
R servers/python/coweb/pyoe/Operation.py
R servers/python/coweb/pyoe/OperationEngine.py
R servers/python/coweb/pyoe/README
R servers/python/coweb/pyoe/UpdateOperation.py
R servers/python/coweb/pyoe/factory.py
R servers/python/coweb/pyoe/nls/messages.js
A servers/python/cowebpyoe/ContextDifference.py
A servers/python/cowebpyoe/ContextVector.py
A servers/python/cowebpyoe/ContextVectorTable.py
A servers/python/cowebpyoe/DeleteOperation.py
A servers/python/cowebpyoe/HistoryBuffer.py
A servers/python/cowebpyoe/InsertOperation.py
A servers/python/cowebpyoe/OTEngine.py
A servers/python/cowebpyoe/Operation.py
A servers/python/cowebpyoe/OperationEngine.py
A servers/python/cowebpyoe/README
A servers/python/cowebpyoe/UpdateOperation.py
A servers/python/cowebpyoe/__init__.py
A servers/python/cowebpyoe/factory.py
Log Message:
-----------
Reorg for python modules, pyoe code is slowly stablizing.
Commit: 1c4fe35237909769d4d431f1291a99f136134974
https://github.com/opencoweb/coweb/commit/1c4fe35237909769d4d431f1291a99f136134974
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
M servers/python/cowebpyoe/ContextDifference.py
M servers/python/cowebpyoe/ContextVector.py
M servers/python/cowebpyoe/HistoryBuffer.py
M servers/python/cowebpyoe/OTEngine.py
Log Message:
-----------
Fixed some more issues.
Commit: e6eb7e5f79c4ebdd499b702d1cb98f98f730816c
https://github.com/opencoweb/coweb/commit/e6eb7e5f79c4ebdd499b702d1cb98f98f730816c
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
M servers/python/cowebpyoe/DeleteOperation.py
M servers/python/cowebpyoe/InsertOperation.py
M servers/python/cowebpyoe/Operation.py
M servers/python/cowebpyoe/UpdateOperation.py
A servers/python/pyoe_test.py
Log Message:
-----------
Fixed up code relating to actually transforming.
Also added tester for pyoe.
Commit: 8c2945ae9c899d761a052ba6a094e1121c4c1732
https://github.com/opencoweb/coweb/commit/8c2945ae9c899d761a052ba6a094e1121c4c1732
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
M servers/python/coweb/admin.py
M servers/python/coweb/application.py
M servers/python/coweb/session/collab.py
Log Message:
-----------
Python server fixes
* Wasn't correctly supplying cowebkey when browser did not specify one.
* Did not correctly handle app sync events (change in channel format)
Commit: 0b1aef251e0734e4550175416ae026325e3a4fa0
https://github.com/opencoweb/coweb/commit/0b1aef251e0734e4550175416ae026325e3a4fa0
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
A js/release/coweb-0.8.3/LICENSE
A js/release/coweb-0.8.3/NOTICES
A js/release/coweb-0.8.3/WEB-INF/web.xml
A js/release/coweb-0.8.3/coweb/ConfigInitializer.js
A js/release/coweb-0.8.3/coweb/collab/UnmanagedHubCollab.js
A js/release/coweb-0.8.3/coweb/ext/CowebWrapper.js
A js/release/coweb-0.8.3/coweb/ext/SimpleLoader.js
A js/release/coweb-0.8.3/coweb/ext/attendance.js
A js/release/coweb-0.8.3/coweb/jsoe/ContextDifference.js
A js/release/coweb-0.8.3/coweb/jsoe/ContextVector.js
A js/release/coweb-0.8.3/coweb/jsoe/ContextVectorTable.js
A js/release/coweb-0.8.3/coweb/jsoe/DeleteOperation.js
A js/release/coweb-0.8.3/coweb/jsoe/HistoryBuffer.js
A js/release/coweb-0.8.3/coweb/jsoe/InsertOperation.js
A js/release/coweb-0.8.3/coweb/jsoe/Operation.js
A js/release/coweb-0.8.3/coweb/jsoe/OperationEngine.js
A js/release/coweb-0.8.3/coweb/jsoe/UpdateOperation.js
A js/release/coweb-0.8.3/coweb/jsoe/factory.js
A js/release/coweb-0.8.3/coweb/jsoe/nls/messages.js
A js/release/coweb-0.8.3/coweb/listener/UnmanagedHubListener.js
A js/release/coweb-0.8.3/coweb/main.js
A js/release/coweb-0.8.3/coweb/nls/messages.js
A js/release/coweb-0.8.3/coweb/session/BayeuxSession.js
A js/release/coweb-0.8.3/coweb/session/bayeux/CowebExtension.js
A js/release/coweb-0.8.3/coweb/session/bayeux/ListenerBridge.js
A js/release/coweb-0.8.3/coweb/session/bayeux/SessionBridge.js
A js/release/coweb-0.8.3/coweb/session/bayeux/cometd.js
A js/release/coweb-0.8.3/coweb/topics.js
A js/release/coweb-0.8.3/coweb/util/Promise.js
A js/release/coweb-0.8.3/coweb/util/lang.js
A js/release/coweb-0.8.3/coweb/util/xhr.js
A js/release/coweb-0.8.3/org/OpenAjax.js
A js/release/coweb-0.8.3/org/cometd.js
A js/release/coweb-0.8.3/org/requirejs/i18n.js
Log Message:
-----------
Add 0.8.3 release for python
Commit: eacb4bcd0f66d1d96705b5995e1ccf57e61e7ec6
https://github.com/opencoweb/coweb/commit/eacb4bcd0f66d1d96705b5995e1ccf57e61e7ec6
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
A servers/python/coweb/OEHandler.py
M servers/python/setup.py
Log Message:
-----------
Starting to add OT engine to python server
Commit: c7c025c5e182368493edd46ceff81877780193f1
https://github.com/opencoweb/coweb/commit/c7c025c5e182368493edd46ceff81877780193f1
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-01 (Mon, 01 Oct 2012)
Changed paths:
M servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
M servers/python/coweb/OEHandler.py
A servers/python/coweb/cowebpyoe/ContextDifference.py
A servers/python/coweb/cowebpyoe/ContextVector.py
A servers/python/coweb/cowebpyoe/ContextVectorTable.py
A servers/python/coweb/cowebpyoe/DeleteOperation.py
A servers/python/coweb/cowebpyoe/HistoryBuffer.py
A servers/python/coweb/cowebpyoe/InsertOperation.py
A servers/python/coweb/cowebpyoe/OTEngine.py
A servers/python/coweb/cowebpyoe/Operation.py
A servers/python/coweb/cowebpyoe/OperationEngine.py
A servers/python/coweb/cowebpyoe/OperationEngineException.py
A servers/python/coweb/cowebpyoe/README
A servers/python/coweb/cowebpyoe/UpdateOperation.py
A servers/python/coweb/cowebpyoe/__init__.py
A servers/python/coweb/cowebpyoe/factory.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
R servers/python/cowebpyoe/ContextDifference.py
R servers/python/cowebpyoe/ContextVector.py
R servers/python/cowebpyoe/ContextVectorTable.py
R servers/python/cowebpyoe/DeleteOperation.py
R servers/python/cowebpyoe/HistoryBuffer.py
R servers/python/cowebpyoe/InsertOperation.py
R servers/python/cowebpyoe/OTEngine.py
R servers/python/cowebpyoe/Operation.py
R servers/python/cowebpyoe/OperationEngine.py
R servers/python/cowebpyoe/README
R servers/python/cowebpyoe/UpdateOperation.py
R servers/python/cowebpyoe/__init__.py
R servers/python/cowebpyoe/factory.py
A servers/python/pydev.sh
Log Message:
-----------
Operation Engine hooked up to python server.
OEHandler python class is instantiated for each coweb session - this
class encapsulates the OperationEngine.
The pyoe files have also been moved, since I can't figure out any other
way to use python's module/package mechanism.
Commit: 0086bc18a7f071cc83c01b2d2fb0d561a677b4fa
https://github.com/opencoweb/coweb/commit/0086bc18a7f071cc83c01b2d2fb0d561a677b4fa
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M docs/changelog.rst
M docs/conf.py
M docs/js/collab.rst
M docs/js/config.rst
A js/build/README.rst
R js/debug/coweb-0.6
R js/release/coweb-0.8.3/LICENSE
R js/release/coweb-0.8.3/NOTICES
R js/release/coweb-0.8.3/WEB-INF/web.xml
R js/release/coweb-0.8.3/coweb/ConfigInitializer.js
R js/release/coweb-0.8.3/coweb/collab/UnmanagedHubCollab.js
R js/release/coweb-0.8.3/coweb/ext/CowebWrapper.js
R js/release/coweb-0.8.3/coweb/ext/SimpleLoader.js
R js/release/coweb-0.8.3/coweb/ext/attendance.js
R js/release/coweb-0.8.3/coweb/jsoe/ContextDifference.js
R js/release/coweb-0.8.3/coweb/jsoe/ContextVector.js
R js/release/coweb-0.8.3/coweb/jsoe/ContextVectorTable.js
R js/release/coweb-0.8.3/coweb/jsoe/DeleteOperation.js
R js/release/coweb-0.8.3/coweb/jsoe/HistoryBuffer.js
R js/release/coweb-0.8.3/coweb/jsoe/InsertOperation.js
R js/release/coweb-0.8.3/coweb/jsoe/Operation.js
R js/release/coweb-0.8.3/coweb/jsoe/OperationEngine.js
R js/release/coweb-0.8.3/coweb/jsoe/UpdateOperation.js
R js/release/coweb-0.8.3/coweb/jsoe/factory.js
R js/release/coweb-0.8.3/coweb/jsoe/nls/messages.js
R js/release/coweb-0.8.3/coweb/listener/UnmanagedHubListener.js
R js/release/coweb-0.8.3/coweb/main.js
R js/release/coweb-0.8.3/coweb/nls/messages.js
R js/release/coweb-0.8.3/coweb/session/BayeuxSession.js
R js/release/coweb-0.8.3/coweb/session/bayeux/CowebExtension.js
R js/release/coweb-0.8.3/coweb/session/bayeux/ListenerBridge.js
R js/release/coweb-0.8.3/coweb/session/bayeux/SessionBridge.js
R js/release/coweb-0.8.3/coweb/session/bayeux/cometd.js
R js/release/coweb-0.8.3/coweb/topics.js
R js/release/coweb-0.8.3/coweb/util/Promise.js
R js/release/coweb-0.8.3/coweb/util/lang.js
R js/release/coweb-0.8.3/coweb/util/xhr.js
R js/release/coweb-0.8.3/org/OpenAjax.js
R js/release/coweb-0.8.3/org/cometd.js
R js/release/coweb-0.8.3/org/requirejs/i18n.js
R js/setup_js.sh
M js/setup_python_js.sh
M servers/java/README.txt
M servers/java/bundle.sh
M servers/java/coweb-admin/admin-archetype/pom.xml
M servers/java/coweb-admin/admin-client/pom.xml
M servers/java/coweb-admin/admin-common/pom.xml
M servers/java/coweb-admin/admin-ejb/pom.xml
M servers/java/coweb-admin/admin-ejb/src/main/resources/META-INF/openejb-jar.xml
M servers/java/coweb-admin/admin-jar/pom.xml
M servers/java/coweb-admin/pom.xml
M servers/java/coweb-archetype/pom.xml
M servers/java/coweb-archetype/src/main/resources/archetype-resources/src/main/webapp/config.js
M servers/java/coweb-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
M servers/java/coweb-bots/pom.xml
M servers/java/coweb-build/pom.xml
M servers/java/coweb-build/src/main/webapp/WEB-INF/web.xml
M servers/java/coweb-build/src/main/webapp/index.html
M servers/java/coweb-build/src/main/webapp/main.js
M servers/java/coweb-client/pom.xml
R servers/java/coweb-javascript-src/pom.xml
R servers/java/coweb-javascript-src/src/main/webapp/WEB-INF/web.xml
M servers/java/coweb-javascript/pom.xml
M servers/java/coweb-javascript/src/main/webapp/coweb/ConfigInitializer.js
M servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
M servers/java/coweb-javascript/src/main/webapp/coweb/main.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/BayeuxSession.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/bayeux/SessionBridge.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/bayeux/cometd.js
M servers/java/coweb-operationengine/pom.xml
M servers/java/coweb-server/pom.xml
M servers/java/coweb-server/src/main/java/org/coweb/CowebSecurityPolicy.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/servlet/AdminServlet.java
M servers/java/pom.xml
Log Message:
-----------
Merged master into python with /js directory cleanup
Commit: 3efc466ca9dac64903d7a8be1a48984dabba38ef
https://github.com/opencoweb/coweb/commit/3efc466ca9dac64903d7a8be1a48984dabba38ef
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-15 (Mon, 15 Oct 2012)
Changed paths:
M servers/python/coweb/__init__.py
M servers/python/coweb/admin.py
M servers/python/coweb/cowebpyoe/OperationEngine.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
M servers/python/coweb/session/session.py
A servers/python/coweb/session_moderator.py
M servers/python/setup.py
Log Message:
-----------
Working on python moderator.
A moderator object is created for each session, but otherwise it does
nothing at this point.
Commit: 0b800840167fb95a6b713824ba110b0c2cb83cd6
https://github.com/opencoweb/coweb/commit/0b800840167fb95a6b713824ba110b0c2cb83cd6
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-15 (Mon, 15 Oct 2012)
Changed paths:
M servers/python/coweb/admin.py
M servers/python/coweb/session/collab.py
A servers/python/coweb/session/late_join_handler.py
Log Message:
-----------
Move late join handling code to separate class
This change mirrors how the Java server handles late join handlers. This
way, having the moderator be able to override sending late join session
data should be a simple change.
Commit: bbf026d9abb4cd6fa3cbccc78462847a8b6eff19
https://github.com/opencoweb/coweb/commit/bbf026d9abb4cd6fa3cbccc78462847a8b6eff19
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-16 (Tue, 16 Oct 2012)
Changed paths:
M servers/python/coweb/OEHandler.py
M servers/python/coweb/session/collab.py
M servers/python/coweb/session/session.py
Log Message:
-----------
Operating engine handles engine syncs now
Commit: 914e9d4ab751abc334ae0ebaf4fb79120b1ea9e7
https://github.com/opencoweb/coweb/commit/914e9d4ab751abc334ae0ebaf4fb79120b1ea9e7
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-16 (Tue, 16 Oct 2012)
Changed paths:
M servers/java/coweb-javascript/src/main/webapp/coweb/listener/UnmanagedHubListener.js
M servers/java/coweb-javascript/src/main/webapp/coweb/topics.js
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
Log Message:
-----------
Merge branch 'master' into python
Commit: d69eac4a46821ae566c16ced10f96a3eedd9165b
https://github.com/opencoweb/coweb/commit/d69eac4a46821ae566c16ced10f96a3eedd9165b
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-31 (Wed, 31 Oct 2012)
Changed paths:
M docs/Makefile
M docs/changelog.rst
A docs/intro/cowebkey.rst
M docs/intro/intro.rst
M docs/intro/modules.rst
M docs/java/java.rst
A docs/java/logging.rst
M docs/java/moderator.rst
M docs/replace.rst
A docs/tutorial/comap.rst
M docs/tutorial/install.rst
A docs/tutorial/python_install.rst.old
M docs/tutorial/tutorial.rst
M servers/java/coweb-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cowebConfig.json
M servers/java/coweb-bots/src/main/java/org/coweb/bots/Bot.java
A servers/java/coweb-bots/src/main/java/org/coweb/bots/VanillaBot.java
M servers/java/coweb-javascript/src/main/webapp/coweb/collab/UnmanagedHubCollab.js
M servers/java/coweb-javascript/src/main/webapp/coweb/listener/UnmanagedHubListener.js
M servers/java/coweb-javascript/src/main/webapp/coweb/nls/messages.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/BayeuxSession.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/bayeux/ListenerBridge.js
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextVector.java
M servers/java/coweb-server/src/main/java/org/coweb/CowebSecurityPolicy.java
M servers/java/coweb-server/src/main/java/org/coweb/DefaultSessionModerator.java
M servers/java/coweb-server/src/main/java/org/coweb/LateJoinHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/ModeratorLateJoinHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/OperationEngineHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/ServiceHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionManager.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionModerator.java
M servers/java/coweb-server/src/main/java/org/coweb/bots/transport/LocalTransport.java
M servers/java/coweb-server/src/main/java/org/coweb/bots/transport/Transport.java
M servers/java/coweb-server/src/main/java/org/coweb/servlet/AdminServlet.java
Log Message:
-----------
Merge branch 'master' into python
Commit: ddfa3246837f63e2a18b7c9a57e42299e5d8c2b2
https://github.com/opencoweb/coweb/commit/ddfa3246837f63e2a18b7c9a57e42299e5d8c2b2
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths:
M js/build/build.sh
A servers/python/coweb/OEHandler.py
M servers/python/coweb/__init__.py
M servers/python/coweb/admin.py
M servers/python/coweb/application.py
A servers/python/coweb/cowebpyoe/ContextDifference.py
A servers/python/coweb/cowebpyoe/ContextVector.py
A servers/python/coweb/cowebpyoe/ContextVectorTable.py
A servers/python/coweb/cowebpyoe/DeleteOperation.py
A servers/python/coweb/cowebpyoe/HistoryBuffer.py
A servers/python/coweb/cowebpyoe/InsertOperation.py
A servers/python/coweb/cowebpyoe/OTEngine.py
A servers/python/coweb/cowebpyoe/Operation.py
A servers/python/coweb/cowebpyoe/OperationEngine.py
A servers/python/coweb/cowebpyoe/OperationEngineException.py
A servers/python/coweb/cowebpyoe/README
A servers/python/coweb/cowebpyoe/UpdateOperation.py
A servers/python/coweb/cowebpyoe/__init__.py
A servers/python/coweb/cowebpyoe/factory.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
A servers/python/coweb/session/late_join_handler.py
M servers/python/coweb/session/session.py
A servers/python/coweb/session_moderator.py
A servers/python/pydev.sh
A servers/python/pyoe_test.py
M servers/python/setup.py
Log Message:
-----------
Merge branch 'python'
Commit: 4a0b983a4711d057b2dfd28e04d5f69519a03143
https://github.com/opencoweb/coweb/commit/4a0b983a4711d057b2dfd28e04d5f69519a03143
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths:
M servers/python/coweb/OEHandler.py
M servers/python/coweb/__init__.py
M servers/python/coweb/access/__init__.py
M servers/python/coweb/access/public.py
M servers/python/coweb/admin.py
M servers/python/coweb/auth/__init__.py
M servers/python/coweb/auth/public.py
M servers/python/coweb/bayeux/__init__.py
M servers/python/coweb/bayeux/channel.py
M servers/python/coweb/bayeux/ext/__init__.py
M servers/python/coweb/bayeux/ext/ack.py
M servers/python/coweb/bayeux/ext/auth.py
M servers/python/coweb/bayeux/ext/echoless.py
M servers/python/coweb/bayeux/manager.py
M servers/python/coweb/bayeux/session.py
M servers/python/coweb/bot/reqack.py
M servers/python/coweb/bot/wrapper/bayeux/websocket.py
M servers/python/coweb/bot/wrapper/bayeux/wrapper.py
M servers/python/coweb/cowebpyoe/ContextDifference.py
M servers/python/coweb/cowebpyoe/ContextVector.py
M servers/python/coweb/cowebpyoe/ContextVectorTable.py
M servers/python/coweb/cowebpyoe/DeleteOperation.py
M servers/python/coweb/cowebpyoe/HistoryBuffer.py
M servers/python/coweb/cowebpyoe/InsertOperation.py
M servers/python/coweb/cowebpyoe/OTEngine.py
M servers/python/coweb/cowebpyoe/Operation.py
M servers/python/coweb/cowebpyoe/OperationEngine.py
M servers/python/coweb/cowebpyoe/UpdateOperation.py
M servers/python/coweb/debug.py
M servers/python/coweb/service/__init__.py
M servers/python/coweb/service/bridge.py
M servers/python/coweb/service/launcher/__init__.py
M servers/python/coweb/service/launcher/process.py
M servers/python/coweb/service/manager/__init__.py
M servers/python/coweb/service/manager/bayeux.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
M servers/python/coweb/session/late_join_handler.py
M servers/python/coweb/session/session.py
M servers/python/coweb/updater/__init__.py
M servers/python/coweb/updater/default.py
M servers/python/pycoweb
M servers/python/pyoe_test.py
M servers/python/setup.py
Log Message:
-----------
Lots of python 2->3 fixes. Still more to do
Compare: https://github.com/opencoweb/coweb/compare/c1333798a6f8...4a0b983a4711
Home: https://github.com/opencoweb/coweb
Commit: b9c363f8df90fc98599428f4d46341097818216c
https://github.com/opencoweb/coweb/commit/b9c363f8df90fc98599428f4d46341097818216c
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-08-31 (Fri, 31 Aug 2012)
Changed paths:
M js/build/build.sh
R js/lib/coweb/ConfigInitializer.js
R js/lib/coweb/collab/UnmanagedHubCollab.js
R js/lib/coweb/ext/CowebWrapper.js
R js/lib/coweb/ext/SimpleLoader.js
R js/lib/coweb/ext/attendance.js
R js/lib/coweb/jsoe/ContextDifference.js
R js/lib/coweb/jsoe/ContextVector.js
R js/lib/coweb/jsoe/ContextVectorTable.js
R js/lib/coweb/jsoe/DeleteOperation.js
R js/lib/coweb/jsoe/HistoryBuffer.js
R js/lib/coweb/jsoe/InsertOperation.js
R js/lib/coweb/jsoe/Operation.js
R js/lib/coweb/jsoe/OperationEngine.js
R js/lib/coweb/jsoe/UpdateOperation.js
R js/lib/coweb/jsoe/factory.js
R js/lib/coweb/listener/UnmanagedHubListener.js
R js/lib/coweb/main.js
R js/lib/coweb/session/BayeuxSession.js
R js/lib/coweb/session/bayeux/CowebExtension.js
R js/lib/coweb/session/bayeux/ListenerBridge.js
R js/lib/coweb/session/bayeux/SessionBridge.js
R js/lib/coweb/session/bayeux/cometd.js
R js/lib/coweb/topics.js
R js/lib/coweb/util/Promise.js
R js/lib/coweb/util/lang.js
R js/lib/coweb/util/xhr.js
M js/setup_js.sh
M js/setup_python_js.sh
M servers/python/coweb/__init__.py
M servers/python/setup.py
Log Message:
-----------
Removed old javascript files, updated build scripts for python
Commit: d084583227a9d3276f980a07811310a1ca0951f1
https://github.com/opencoweb/coweb/commit/d084583227a9d3276f980a07811310a1ca0951f1
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-10 (Mon, 10 Sep 2012)
Changed paths:
A .gitmodules
M README.rst
M docs/Makefile
M docs/conf.py
M docs/java/java.rst
A docs/java/moderator.rst
M docs/protocol/coweb_bayeux.rst
M docs/replace.rst
A docs/tutorial/semantics.rst
M docs/tutorial/tutorial.rst
M servers/java/README.txt
M servers/java/bundle.sh
M servers/java/coweb-admin/admin-archetype/pom.xml
M servers/java/coweb-admin/admin-client/pom.xml
M servers/java/coweb-admin/admin-common/pom.xml
M servers/java/coweb-admin/admin-ejb/pom.xml
M servers/java/coweb-admin/admin-ejb/src/main/resources/META-INF/openejb-jar.xml
M servers/java/coweb-admin/admin-jar/pom.xml
M servers/java/coweb-admin/admin-jar/src/main/java/org/coweb/admin/acls/SessionAcls.java
M servers/java/coweb-admin/pom.xml
M servers/java/coweb-archetype/pom.xml
M servers/java/coweb-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
M servers/java/coweb-archetype/src/main/resources/META-INF/maven/archetype.xml
M servers/java/coweb-bots/pom.xml
M servers/java/coweb-build/pom.xml
M servers/java/coweb-client/pom.xml
M servers/java/coweb-javascript-src/pom.xml
A servers/java/coweb-javascript/README
M servers/java/coweb-javascript/pom.xml
M servers/java/coweb-javascript/src/main/webapp/WEB-INF/web.xml
A servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/ContextDifference.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/ContextVector.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/ContextVectorTable.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/DeleteOperation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/HistoryBuffer.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/InsertOperation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/Operation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/OperationEngine.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/UpdateOperation.js
R servers/java/coweb-javascript/src/main/webapp/coweb/jsoe/factory.js
M servers/java/coweb-javascript/src/main/webapp/coweb/listener/UnmanagedHubListener.js
M servers/java/coweb-javascript/src/main/webapp/coweb/main.js
M servers/java/coweb-javascript/src/main/webapp/coweb/nls/messages.js
M servers/java/coweb-operationengine/pom.xml
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextDifference.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextVector.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextVectorTable.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/DeleteOperation.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/HistoryBuffer.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/InsertOperation.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/Operation.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/OperationEngine.java
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/UpdateOperation.java
M servers/java/coweb-server/pom.xml
M servers/java/coweb-server/src/main/java/org/coweb/OperationEngineHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionManager.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionModerator.java
M servers/java/coweb-server/src/main/java/org/coweb/servlet/AdminServlet.java
M servers/java/pom.xml
Log Message:
-----------
Merge master into python
Commit: 389f0e81c52166cde27627ef5ac78a8bf864f921
https://github.com/opencoweb/coweb/commit/389f0e81c52166cde27627ef5ac78a8bf864f921
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-11 (Tue, 11 Sep 2012)
Changed paths:
A servers/python/coweb/pyoe/ContextDifference.py
A servers/python/coweb/pyoe/ContextVector.py
A servers/python/coweb/pyoe/ContextVectorTable.py
A servers/python/coweb/pyoe/DeleteOperation.js
A servers/python/coweb/pyoe/HistoryBuffer.py
A servers/python/coweb/pyoe/InsertOperation.js
A servers/python/coweb/pyoe/OTEngine.js
A servers/python/coweb/pyoe/Operation.js
A servers/python/coweb/pyoe/OperationEngine.py
A servers/python/coweb/pyoe/README
A servers/python/coweb/pyoe/UpdateOperation.js
A servers/python/coweb/pyoe/factory.py
A servers/python/coweb/pyoe/nls/messages.js
Log Message:
-----------
Begin converting jsoe to python
Copied jsoe to a new python directory: pyoe.
Have changed some files to python, still need to check for things like:
Python throws errors when key doesn't exist in dictionary.
Commit: 929fd88f5d1170302534175fbca7ae7a0c1863fc
https://github.com/opencoweb/coweb/commit/929fd88f5d1170302534175fbca7ae7a0c1863fc
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-12 (Wed, 12 Sep 2012)
Changed paths:
M servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
M servers/python/coweb/pyoe/ContextVector.py
R servers/python/coweb/pyoe/DeleteOperation.js
A servers/python/coweb/pyoe/DeleteOperation.py
M servers/python/coweb/pyoe/HistoryBuffer.py
R servers/python/coweb/pyoe/InsertOperation.js
A servers/python/coweb/pyoe/InsertOperation.py
R servers/python/coweb/pyoe/OTEngine.js
R servers/python/coweb/pyoe/Operation.js
A servers/python/coweb/pyoe/Operation.py
R servers/python/coweb/pyoe/UpdateOperation.js
A servers/python/coweb/pyoe/UpdateOperation.py
Log Message:
-----------
All jsoe files have been converted to python and are syntactically correct (though probably not logically correct)
Commit: d21864fad3699ffac6370ded2abc03c3bd81dbc0
https://github.com/opencoweb/coweb/commit/d21864fad3699ffac6370ded2abc03c3bd81dbc0
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-12 (Wed, 12 Sep 2012)
Changed paths:
R servers/python/coweb/pyoe/ContextDifference.py
R servers/python/coweb/pyoe/ContextVector.py
R servers/python/coweb/pyoe/ContextVectorTable.py
R servers/python/coweb/pyoe/DeleteOperation.py
R servers/python/coweb/pyoe/HistoryBuffer.py
R servers/python/coweb/pyoe/InsertOperation.py
R servers/python/coweb/pyoe/Operation.py
R servers/python/coweb/pyoe/OperationEngine.py
R servers/python/coweb/pyoe/README
R servers/python/coweb/pyoe/UpdateOperation.py
R servers/python/coweb/pyoe/factory.py
R servers/python/coweb/pyoe/nls/messages.js
A servers/python/cowebpyoe/ContextDifference.py
A servers/python/cowebpyoe/ContextVector.py
A servers/python/cowebpyoe/ContextVectorTable.py
A servers/python/cowebpyoe/DeleteOperation.py
A servers/python/cowebpyoe/HistoryBuffer.py
A servers/python/cowebpyoe/InsertOperation.py
A servers/python/cowebpyoe/OTEngine.py
A servers/python/cowebpyoe/Operation.py
A servers/python/cowebpyoe/OperationEngine.py
A servers/python/cowebpyoe/README
A servers/python/cowebpyoe/UpdateOperation.py
A servers/python/cowebpyoe/__init__.py
A servers/python/cowebpyoe/factory.py
Log Message:
-----------
Reorg for python modules, pyoe code is slowly stablizing.
Commit: 1c4fe35237909769d4d431f1291a99f136134974
https://github.com/opencoweb/coweb/commit/1c4fe35237909769d4d431f1291a99f136134974
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
M servers/python/cowebpyoe/ContextDifference.py
M servers/python/cowebpyoe/ContextVector.py
M servers/python/cowebpyoe/HistoryBuffer.py
M servers/python/cowebpyoe/OTEngine.py
Log Message:
-----------
Fixed some more issues.
Commit: e6eb7e5f79c4ebdd499b702d1cb98f98f730816c
https://github.com/opencoweb/coweb/commit/e6eb7e5f79c4ebdd499b702d1cb98f98f730816c
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
M servers/python/cowebpyoe/DeleteOperation.py
M servers/python/cowebpyoe/InsertOperation.py
M servers/python/cowebpyoe/Operation.py
M servers/python/cowebpyoe/UpdateOperation.py
A servers/python/pyoe_test.py
Log Message:
-----------
Fixed up code relating to actually transforming.
Also added tester for pyoe.
Commit: 8c2945ae9c899d761a052ba6a094e1121c4c1732
https://github.com/opencoweb/coweb/commit/8c2945ae9c899d761a052ba6a094e1121c4c1732
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
M servers/python/coweb/admin.py
M servers/python/coweb/application.py
M servers/python/coweb/session/collab.py
Log Message:
-----------
Python server fixes
* Wasn't correctly supplying cowebkey when browser did not specify one.
* Did not correctly handle app sync events (change in channel format)
Commit: 0b1aef251e0734e4550175416ae026325e3a4fa0
https://github.com/opencoweb/coweb/commit/0b1aef251e0734e4550175416ae026325e3a4fa0
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
A js/release/coweb-0.8.3/LICENSE
A js/release/coweb-0.8.3/NOTICES
A js/release/coweb-0.8.3/WEB-INF/web.xml
A js/release/coweb-0.8.3/coweb/ConfigInitializer.js
A js/release/coweb-0.8.3/coweb/collab/UnmanagedHubCollab.js
A js/release/coweb-0.8.3/coweb/ext/CowebWrapper.js
A js/release/coweb-0.8.3/coweb/ext/SimpleLoader.js
A js/release/coweb-0.8.3/coweb/ext/attendance.js
A js/release/coweb-0.8.3/coweb/jsoe/ContextDifference.js
A js/release/coweb-0.8.3/coweb/jsoe/ContextVector.js
A js/release/coweb-0.8.3/coweb/jsoe/ContextVectorTable.js
A js/release/coweb-0.8.3/coweb/jsoe/DeleteOperation.js
A js/release/coweb-0.8.3/coweb/jsoe/HistoryBuffer.js
A js/release/coweb-0.8.3/coweb/jsoe/InsertOperation.js
A js/release/coweb-0.8.3/coweb/jsoe/Operation.js
A js/release/coweb-0.8.3/coweb/jsoe/OperationEngine.js
A js/release/coweb-0.8.3/coweb/jsoe/UpdateOperation.js
A js/release/coweb-0.8.3/coweb/jsoe/factory.js
A js/release/coweb-0.8.3/coweb/jsoe/nls/messages.js
A js/release/coweb-0.8.3/coweb/listener/UnmanagedHubListener.js
A js/release/coweb-0.8.3/coweb/main.js
A js/release/coweb-0.8.3/coweb/nls/messages.js
A js/release/coweb-0.8.3/coweb/session/BayeuxSession.js
A js/release/coweb-0.8.3/coweb/session/bayeux/CowebExtension.js
A js/release/coweb-0.8.3/coweb/session/bayeux/ListenerBridge.js
A js/release/coweb-0.8.3/coweb/session/bayeux/SessionBridge.js
A js/release/coweb-0.8.3/coweb/session/bayeux/cometd.js
A js/release/coweb-0.8.3/coweb/topics.js
A js/release/coweb-0.8.3/coweb/util/Promise.js
A js/release/coweb-0.8.3/coweb/util/lang.js
A js/release/coweb-0.8.3/coweb/util/xhr.js
A js/release/coweb-0.8.3/org/OpenAjax.js
A js/release/coweb-0.8.3/org/cometd.js
A js/release/coweb-0.8.3/org/requirejs/i18n.js
Log Message:
-----------
Add 0.8.3 release for python
Commit: eacb4bcd0f66d1d96705b5995e1ccf57e61e7ec6
https://github.com/opencoweb/coweb/commit/eacb4bcd0f66d1d96705b5995e1ccf57e61e7ec6
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
A servers/python/coweb/OEHandler.py
M servers/python/setup.py
Log Message:
-----------
Starting to add OT engine to python server
Commit: c7c025c5e182368493edd46ceff81877780193f1
https://github.com/opencoweb/coweb/commit/c7c025c5e182368493edd46ceff81877780193f1
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-01 (Mon, 01 Oct 2012)
Changed paths:
M servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
M servers/python/coweb/OEHandler.py
A servers/python/coweb/cowebpyoe/ContextDifference.py
A servers/python/coweb/cowebpyoe/ContextVector.py
A servers/python/coweb/cowebpyoe/ContextVectorTable.py
A servers/python/coweb/cowebpyoe/DeleteOperation.py
A servers/python/coweb/cowebpyoe/HistoryBuffer.py
A servers/python/coweb/cowebpyoe/InsertOperation.py
A servers/python/coweb/cowebpyoe/OTEngine.py
A servers/python/coweb/cowebpyoe/Operation.py
A servers/python/coweb/cowebpyoe/OperationEngine.py
A servers/python/coweb/cowebpyoe/OperationEngineException.py
A servers/python/coweb/cowebpyoe/README
A servers/python/coweb/cowebpyoe/UpdateOperation.py
A servers/python/coweb/cowebpyoe/__init__.py
A servers/python/coweb/cowebpyoe/factory.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
R servers/python/cowebpyoe/ContextDifference.py
R servers/python/cowebpyoe/ContextVector.py
R servers/python/cowebpyoe/ContextVectorTable.py
R servers/python/cowebpyoe/DeleteOperation.py
R servers/python/cowebpyoe/HistoryBuffer.py
R servers/python/cowebpyoe/InsertOperation.py
R servers/python/cowebpyoe/OTEngine.py
R servers/python/cowebpyoe/Operation.py
R servers/python/cowebpyoe/OperationEngine.py
R servers/python/cowebpyoe/README
R servers/python/cowebpyoe/UpdateOperation.py
R servers/python/cowebpyoe/__init__.py
R servers/python/cowebpyoe/factory.py
A servers/python/pydev.sh
Log Message:
-----------
Operation Engine hooked up to python server.
OEHandler python class is instantiated for each coweb session - this
class encapsulates the OperationEngine.
The pyoe files have also been moved, since I can't figure out any other
way to use python's module/package mechanism.
Commit: 0086bc18a7f071cc83c01b2d2fb0d561a677b4fa
https://github.com/opencoweb/coweb/commit/0086bc18a7f071cc83c01b2d2fb0d561a677b4fa
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M docs/changelog.rst
M docs/conf.py
M docs/js/collab.rst
M docs/js/config.rst
A js/build/README.rst
R js/debug/coweb-0.6
R js/release/coweb-0.8.3/LICENSE
R js/release/coweb-0.8.3/NOTICES
R js/release/coweb-0.8.3/WEB-INF/web.xml
R js/release/coweb-0.8.3/coweb/ConfigInitializer.js
R js/release/coweb-0.8.3/coweb/collab/UnmanagedHubCollab.js
R js/release/coweb-0.8.3/coweb/ext/CowebWrapper.js
R js/release/coweb-0.8.3/coweb/ext/SimpleLoader.js
R js/release/coweb-0.8.3/coweb/ext/attendance.js
R js/release/coweb-0.8.3/coweb/jsoe/ContextDifference.js
R js/release/coweb-0.8.3/coweb/jsoe/ContextVector.js
R js/release/coweb-0.8.3/coweb/jsoe/ContextVectorTable.js
R js/release/coweb-0.8.3/coweb/jsoe/DeleteOperation.js
R js/release/coweb-0.8.3/coweb/jsoe/HistoryBuffer.js
R js/release/coweb-0.8.3/coweb/jsoe/InsertOperation.js
R js/release/coweb-0.8.3/coweb/jsoe/Operation.js
R js/release/coweb-0.8.3/coweb/jsoe/OperationEngine.js
R js/release/coweb-0.8.3/coweb/jsoe/UpdateOperation.js
R js/release/coweb-0.8.3/coweb/jsoe/factory.js
R js/release/coweb-0.8.3/coweb/jsoe/nls/messages.js
R js/release/coweb-0.8.3/coweb/listener/UnmanagedHubListener.js
R js/release/coweb-0.8.3/coweb/main.js
R js/release/coweb-0.8.3/coweb/nls/messages.js
R js/release/coweb-0.8.3/coweb/session/BayeuxSession.js
R js/release/coweb-0.8.3/coweb/session/bayeux/CowebExtension.js
R js/release/coweb-0.8.3/coweb/session/bayeux/ListenerBridge.js
R js/release/coweb-0.8.3/coweb/session/bayeux/SessionBridge.js
R js/release/coweb-0.8.3/coweb/session/bayeux/cometd.js
R js/release/coweb-0.8.3/coweb/topics.js
R js/release/coweb-0.8.3/coweb/util/Promise.js
R js/release/coweb-0.8.3/coweb/util/lang.js
R js/release/coweb-0.8.3/coweb/util/xhr.js
R js/release/coweb-0.8.3/org/OpenAjax.js
R js/release/coweb-0.8.3/org/cometd.js
R js/release/coweb-0.8.3/org/requirejs/i18n.js
R js/setup_js.sh
M js/setup_python_js.sh
M servers/java/README.txt
M servers/java/bundle.sh
M servers/java/coweb-admin/admin-archetype/pom.xml
M servers/java/coweb-admin/admin-client/pom.xml
M servers/java/coweb-admin/admin-common/pom.xml
M servers/java/coweb-admin/admin-ejb/pom.xml
M servers/java/coweb-admin/admin-ejb/src/main/resources/META-INF/openejb-jar.xml
M servers/java/coweb-admin/admin-jar/pom.xml
M servers/java/coweb-admin/pom.xml
M servers/java/coweb-archetype/pom.xml
M servers/java/coweb-archetype/src/main/resources/archetype-resources/src/main/webapp/config.js
M servers/java/coweb-archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
M servers/java/coweb-bots/pom.xml
M servers/java/coweb-build/pom.xml
M servers/java/coweb-build/src/main/webapp/WEB-INF/web.xml
M servers/java/coweb-build/src/main/webapp/index.html
M servers/java/coweb-build/src/main/webapp/main.js
M servers/java/coweb-client/pom.xml
R servers/java/coweb-javascript-src/pom.xml
R servers/java/coweb-javascript-src/src/main/webapp/WEB-INF/web.xml
M servers/java/coweb-javascript/pom.xml
M servers/java/coweb-javascript/src/main/webapp/coweb/ConfigInitializer.js
M servers/java/coweb-javascript/src/main/webapp/coweb/jsoe
M servers/java/coweb-javascript/src/main/webapp/coweb/main.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/BayeuxSession.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/bayeux/SessionBridge.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/bayeux/cometd.js
M servers/java/coweb-operationengine/pom.xml
M servers/java/coweb-server/pom.xml
M servers/java/coweb-server/src/main/java/org/coweb/CowebSecurityPolicy.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/servlet/AdminServlet.java
M servers/java/pom.xml
Log Message:
-----------
Merged master into python with /js directory cleanup
Commit: 3efc466ca9dac64903d7a8be1a48984dabba38ef
https://github.com/opencoweb/coweb/commit/3efc466ca9dac64903d7a8be1a48984dabba38ef
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-15 (Mon, 15 Oct 2012)
Changed paths:
M servers/python/coweb/__init__.py
M servers/python/coweb/admin.py
M servers/python/coweb/cowebpyoe/OperationEngine.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
M servers/python/coweb/session/session.py
A servers/python/coweb/session_moderator.py
M servers/python/setup.py
Log Message:
-----------
Working on python moderator.
A moderator object is created for each session, but otherwise it does
nothing at this point.
Commit: 0b800840167fb95a6b713824ba110b0c2cb83cd6
https://github.com/opencoweb/coweb/commit/0b800840167fb95a6b713824ba110b0c2cb83cd6
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-15 (Mon, 15 Oct 2012)
Changed paths:
M servers/python/coweb/admin.py
M servers/python/coweb/session/collab.py
A servers/python/coweb/session/late_join_handler.py
Log Message:
-----------
Move late join handling code to separate class
This change mirrors how the Java server handles late join handlers. This
way, having the moderator be able to override sending late join session
data should be a simple change.
Commit: bbf026d9abb4cd6fa3cbccc78462847a8b6eff19
https://github.com/opencoweb/coweb/commit/bbf026d9abb4cd6fa3cbccc78462847a8b6eff19
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-16 (Tue, 16 Oct 2012)
Changed paths:
M servers/python/coweb/OEHandler.py
M servers/python/coweb/session/collab.py
M servers/python/coweb/session/session.py
Log Message:
-----------
Operating engine handles engine syncs now
Commit: 914e9d4ab751abc334ae0ebaf4fb79120b1ea9e7
https://github.com/opencoweb/coweb/commit/914e9d4ab751abc334ae0ebaf4fb79120b1ea9e7
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-16 (Tue, 16 Oct 2012)
Changed paths:
M servers/java/coweb-javascript/src/main/webapp/coweb/listener/UnmanagedHubListener.js
M servers/java/coweb-javascript/src/main/webapp/coweb/topics.js
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
Log Message:
-----------
Merge branch 'master' into python
Commit: d69eac4a46821ae566c16ced10f96a3eedd9165b
https://github.com/opencoweb/coweb/commit/d69eac4a46821ae566c16ced10f96a3eedd9165b
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-10-31 (Wed, 31 Oct 2012)
Changed paths:
M docs/Makefile
M docs/changelog.rst
A docs/intro/cowebkey.rst
M docs/intro/intro.rst
M docs/intro/modules.rst
M docs/java/java.rst
A docs/java/logging.rst
M docs/java/moderator.rst
M docs/replace.rst
A docs/tutorial/comap.rst
M docs/tutorial/install.rst
A docs/tutorial/python_install.rst.old
M docs/tutorial/tutorial.rst
M servers/java/coweb-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cowebConfig.json
M servers/java/coweb-bots/src/main/java/org/coweb/bots/Bot.java
A servers/java/coweb-bots/src/main/java/org/coweb/bots/VanillaBot.java
M servers/java/coweb-javascript/src/main/webapp/coweb/collab/UnmanagedHubCollab.js
M servers/java/coweb-javascript/src/main/webapp/coweb/listener/UnmanagedHubListener.js
M servers/java/coweb-javascript/src/main/webapp/coweb/nls/messages.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/BayeuxSession.js
M servers/java/coweb-javascript/src/main/webapp/coweb/session/bayeux/ListenerBridge.js
M servers/java/coweb-operationengine/src/main/java/org/coweb/oe/ContextVector.java
M servers/java/coweb-server/src/main/java/org/coweb/CowebSecurityPolicy.java
M servers/java/coweb-server/src/main/java/org/coweb/DefaultSessionModerator.java
M servers/java/coweb-server/src/main/java/org/coweb/LateJoinHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/ModeratorLateJoinHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/OperationEngineHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/ServiceHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionHandler.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionManager.java
M servers/java/coweb-server/src/main/java/org/coweb/SessionModerator.java
M servers/java/coweb-server/src/main/java/org/coweb/bots/transport/LocalTransport.java
M servers/java/coweb-server/src/main/java/org/coweb/bots/transport/Transport.java
M servers/java/coweb-server/src/main/java/org/coweb/servlet/AdminServlet.java
Log Message:
-----------
Merge branch 'master' into python
Commit: ddfa3246837f63e2a18b7c9a57e42299e5d8c2b2
https://github.com/opencoweb/coweb/commit/ddfa3246837f63e2a18b7c9a57e42299e5d8c2b2
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths:
M js/build/build.sh
A servers/python/coweb/OEHandler.py
M servers/python/coweb/__init__.py
M servers/python/coweb/admin.py
M servers/python/coweb/application.py
A servers/python/coweb/cowebpyoe/ContextDifference.py
A servers/python/coweb/cowebpyoe/ContextVector.py
A servers/python/coweb/cowebpyoe/ContextVectorTable.py
A servers/python/coweb/cowebpyoe/DeleteOperation.py
A servers/python/coweb/cowebpyoe/HistoryBuffer.py
A servers/python/coweb/cowebpyoe/InsertOperation.py
A servers/python/coweb/cowebpyoe/OTEngine.py
A servers/python/coweb/cowebpyoe/Operation.py
A servers/python/coweb/cowebpyoe/OperationEngine.py
A servers/python/coweb/cowebpyoe/OperationEngineException.py
A servers/python/coweb/cowebpyoe/README
A servers/python/coweb/cowebpyoe/UpdateOperation.py
A servers/python/coweb/cowebpyoe/__init__.py
A servers/python/coweb/cowebpyoe/factory.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
A servers/python/coweb/session/late_join_handler.py
M servers/python/coweb/session/session.py
A servers/python/coweb/session_moderator.py
A servers/python/pydev.sh
A servers/python/pyoe_test.py
M servers/python/setup.py
Log Message:
-----------
Merge branch 'python'
Commit: 4a0b983a4711d057b2dfd28e04d5f69519a03143
https://github.com/opencoweb/coweb/commit/4a0b983a4711d057b2dfd28e04d5f69519a03143
Author: Chris Cotter <cco...@utexas.edu>
Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths:
M servers/python/coweb/OEHandler.py
M servers/python/coweb/__init__.py
M servers/python/coweb/access/__init__.py
M servers/python/coweb/access/public.py
M servers/python/coweb/admin.py
M servers/python/coweb/auth/__init__.py
M servers/python/coweb/auth/public.py
M servers/python/coweb/bayeux/__init__.py
M servers/python/coweb/bayeux/channel.py
M servers/python/coweb/bayeux/ext/__init__.py
M servers/python/coweb/bayeux/ext/ack.py
M servers/python/coweb/bayeux/ext/auth.py
M servers/python/coweb/bayeux/ext/echoless.py
M servers/python/coweb/bayeux/manager.py
M servers/python/coweb/bayeux/session.py
M servers/python/coweb/bot/reqack.py
M servers/python/coweb/bot/wrapper/bayeux/websocket.py
M servers/python/coweb/bot/wrapper/bayeux/wrapper.py
M servers/python/coweb/cowebpyoe/ContextDifference.py
M servers/python/coweb/cowebpyoe/ContextVector.py
M servers/python/coweb/cowebpyoe/ContextVectorTable.py
M servers/python/coweb/cowebpyoe/DeleteOperation.py
M servers/python/coweb/cowebpyoe/HistoryBuffer.py
M servers/python/coweb/cowebpyoe/InsertOperation.py
M servers/python/coweb/cowebpyoe/OTEngine.py
M servers/python/coweb/cowebpyoe/Operation.py
M servers/python/coweb/cowebpyoe/OperationEngine.py
M servers/python/coweb/cowebpyoe/UpdateOperation.py
M servers/python/coweb/debug.py
M servers/python/coweb/service/__init__.py
M servers/python/coweb/service/bridge.py
M servers/python/coweb/service/launcher/__init__.py
M servers/python/coweb/service/launcher/process.py
M servers/python/coweb/service/manager/__init__.py
M servers/python/coweb/service/manager/bayeux.py
M servers/python/coweb/session/__init__.py
M servers/python/coweb/session/collab.py
M servers/python/coweb/session/late_join_handler.py
M servers/python/coweb/session/session.py
M servers/python/coweb/updater/__init__.py
M servers/python/coweb/updater/default.py
M servers/python/pycoweb
M servers/python/pyoe_test.py
M servers/python/setup.py
Log Message:
-----------
Lots of python 2->3 fixes. Still more to do
Compare: https://github.com/opencoweb/coweb/compare/c1333798a6f8...4a0b983a4711
Reply all
Reply to author
Forward
0 new messages